Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add option to toggle zero-tick fix

Browse Source
This commit is contained in:
William Blake Galbreath
2019-08-31 17:34:35 -05:00
parent 372f7165cd
commit 2ba5de2b60
14 changed files with 65 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docs/source/configuration.rst
View File

@@ -60,6 +60,11 @@ fix-item-position-desync
.. warning::
The `fix-item-position-desync` option is highly experimental! Only enable this if you are feeling brave.
fix-zero-tick-farms
~~~~~~~~~~~~~~~~~~~
* **default**: true
* **description**: Prevents crops from growing using the zero-tick trick (fixes MC-113809)
large-ender-chests
~~~~~~~~~~~~~~
* **default**: true

25
patches/server/0035-Fix-MC-113809-Only-grow-cactus-reeds-bamboo-chorus-f.patch
View File

@@ -1,4 +1,4 @@
From 6671cfadc33e835c678b2b33c32b0c9cb80045c0 Mon Sep 17 00:00:00 2001
From bbac8483ad1389af8b43a0f1e82811420f67a86e Mon Sep 17 00:00:00 2001
From: Phoenix616 <mail@moep.tv>
Date: Thu, 16 May 2019 01:33:46 +0100
Subject: [PATCH] Fix MC-113809 Only grow cactus/reeds/bamboo/chorus fruit on
@@ -11,7 +11,8 @@ Subject: [PATCH] Fix MC-113809 Only grow cactus/reeds/bamboo/chorus fruit on
src/main/java/net/minecraft/server/BlockChorusFlower.java | 1 +
src/main/java/net/minecraft/server/BlockReed.java | 1 +
src/main/java/net/minecraft/server/WorldServer.java | 2 ++
6 files changed, 7 insertions(+)
src/main/java/net/pl3x/purpur/PurpurConfig.java | 5 +++++
7 files changed, 12 insertions(+)
diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
index f9747fb18..4a537d1d7 100644
@@ -74,19 +75,35 @@ index ff674a9d5..4a13e248e 100644
for (i = 1; world.getType(blockposition.down(i)).getBlock() == this; ++i) {
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 5eff278e7..163d4fa85 100644
index 4ffcb15af..d8bcae0ab 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -527,7 +527,9 @@ public class WorldServer extends World {
IBlockData iblockdata = chunksection.getType(blockposition2.getX() - j, blockposition2.getY() - j1, blockposition2.getZ() - k);
if (iblockdata.q()) {
+ iblockdata.getBlock().randomTick = true; // Purpur - fix MC-113809
+ iblockdata.getBlock().randomTick = net.pl3x.purpur.PurpurConfig.fixZeroTickFarms; // Purpur - fix MC-113809
iblockdata.b((World) this, blockposition2, this.random);
+ iblockdata.getBlock().randomTick = false; // Purpur - fix MC-113809
}
Fluid fluid = iblockdata.p();
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 0e3a64e85..f31e7edb2 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -151,6 +151,11 @@ public class PurpurConfig {
fixItemPositionDesync = getBoolean("settings.fix-item-position-desync", fixItemPositionDesync);
}
+ public static boolean fixZeroTickFarms = true;
+ private static void fixZeroTickFarms() {
+ fixZeroTickFarms = getBoolean("settings.fix-zero-tick-farms", fixZeroTickFarms);
+ }
+
public static boolean requireShiftToMount = true;
private static void requireShiftToMount() {
requireShiftToMount = getBoolean("settings.mobs.require-shift-to-mount", requireShiftToMount);
--
2.23.0.rc1

8
patches/server/0036-Add-chance-for-zombie-horse-natural-spawns.patch
View File

@@ -1,4 +1,4 @@
From 2922bb6e1c02352f23e17784f7cfefb4eaefb05b Mon Sep 17 00:00:00 2001
From 26a2388efb0c2a1076cbbefea9f82b409f427a4b Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 7 Jul 2019 19:52:16 -0500
Subject: [PATCH] Add chance for zombie horse natural spawns
@@ -9,7 +9,7 @@ Subject: [PATCH] Add chance for zombie horse natural spawns
2 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 75492a655..7ffcc1f1a 100644
index d8bcae0ab..a8eeba16c 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -477,12 +477,18 @@ public class WorldServer extends World {
@@ -38,10 +38,10 @@ index 75492a655..7ffcc1f1a 100644
this.strikeLightning(new EntityLightning(this, (double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D, flag1), org.bukkit.event.weather.LightningStrikeEvent.Cause.WEATHER); // CraftBukkit
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 0e3a64e85..538ebb7fd 100644
index f31e7edb2..4973d7089 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -205,6 +205,11 @@ public class PurpurConfig {
@@ -210,6 +210,11 @@ public class PurpurConfig {
snowmanPumpkinPutBack = getBoolean("settings.mobs.snow_golem.pumpkin-can-be-added-back", snowmanPumpkinPutBack);
}

6
patches/server/0037-Fix-pig-zombies-MC-56653.patch
View File

@@ -1,4 +1,4 @@
From 1c2af02b95c6fc297b6c6e1dd13d5dfffc813405 Mon Sep 17 00:00:00 2001
From 498337a3f63db4ab1025ef71baac9d70d2d81bc5 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 9 Jul 2019 20:56:47 -0500
Subject: [PATCH] Fix pig zombies (MC-56653)
@@ -43,10 +43,10 @@ index 5760a1836..54ccc93f1 100644
public PathfinderGoalAnger(EntityPigZombie entitypigzombie) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 538ebb7fd..4ce905aba 100644
index 4973d7089..308440e81 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -198,6 +198,11 @@ public class PurpurConfig {
@@ -203,6 +203,11 @@ public class PurpurConfig {
phantomsOrbitCrystalsRadius = getDouble("settings.mobs.phantom.orbit-crystal-radius", phantomsOrbitCrystalsRadius);
}

6
patches/server/0040-Tulips-change-fox-type.patch
View File

@@ -1,4 +1,4 @@
From 6fdcebd77a151ef668b74d43b3823a8be700d73d Mon Sep 17 00:00:00 2001
From 3559aa99c5b8439b40943766a85fe43c001a58fd Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 13 Jul 2019 15:56:22 -0500
Subject: [PATCH] Tulips change fox type
@@ -77,10 +77,10 @@ index 987297634..eed256349 100644
public static final Item bd = a(Blocks.OXEYE_DAISY, CreativeModeTab.c);
public static final Item be = a(Blocks.CORNFLOWER, CreativeModeTab.c);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 4ce905aba..c4f1ab8f2 100644
index 308440e81..6aa8756f4 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -172,6 +172,11 @@ public class PurpurConfig {
@@ -177,6 +177,11 @@ public class PurpurConfig {
enderDragonAlwaysDropsEggBlock = getBoolean("settings.mobs.ender-dragon.always-drop-egg-block", enderDragonAlwaysDropsEggBlock);
}

8
patches/server/0041-Mending-mends-most-damages-equipment-first.patch
View File

@@ -1,4 +1,4 @@
From b6bb5c2e6b611b805eeaf9788eac48144d910e18 Mon Sep 17 00:00:00 2001
From 9db3ce26c27445e2ba7eecc2b62d406048560829 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 14 Jul 2019 19:52:47 -0500
Subject: [PATCH] Mending mends most damages equipment first
@@ -86,11 +86,11 @@ index 0e164840f..41e889165 100644
return this.tag == null ? 0 : this.tag.getInt("Damage");
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index b0f5c3db3..938cd4291 100644
index 6aa8756f4..637d662ad 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -151,6 +151,11 @@ public class PurpurConfig {
fixItemPositionDesync = getBoolean("settings.fix-item-position-desync", fixItemPositionDesync);
@@ -156,6 +156,11 @@ public class PurpurConfig {
fixZeroTickFarms = getBoolean("settings.fix-zero-tick-farms", fixZeroTickFarms);
}
+ public static boolean useBetterMending = true;

6
patches/server/0047-Implement-configurable-villager-brain-ticks.patch
View File

@@ -1,4 +1,4 @@
From 9e5e09ccddfe2aea09de7693fca3e0af87969fe0 Mon Sep 17 00:00:00 2001
From 3174c10502e713e1425ba55a92b50441a0f91a99 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 23 Jul 2019 08:28:21 -0500
Subject: [PATCH] Implement configurable villager brain ticks
@@ -40,10 +40,10 @@ index 70e8a422a..da3fb4b57 100644
this.world.getMethodProfiler().exit();
if (!this.dY() && this.bE > 0) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index cdfd39374..ed2cdf509 100644
index 3f3ce537c..dae2fb4de 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -230,6 +230,13 @@ public class PurpurConfig {
@@ -235,6 +235,13 @@ public class PurpurConfig {
snowmanPumpkinPutBack = getBoolean("settings.mobs.snow_golem.pumpkin-can-be-added-back", snowmanPumpkinPutBack);
}

6
patches/server/0049-Add-option-to-disable-pillager-patrols.patch
View File

@@ -1,4 +1,4 @@
From c5510ce78aa5573cb977a87a40dcb94d9ba227fa Mon Sep 17 00:00:00 2001
From 66461ab5bebe76f172293900f0e44998ac8f66de Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 27 Jul 2019 17:20:35 -0500
Subject: [PATCH] Add option to disable pillager patrols
@@ -21,10 +21,10 @@ index bb612b386..99bb38f03 100644
return 0;
} else {
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index ed2cdf509..4243cd4d7 100644
index dae2fb4de..594c50a18 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -223,6 +223,11 @@ public class PurpurConfig {
@@ -228,6 +228,11 @@ public class PurpurConfig {
pigmenDontTargetUnlessHit = getBoolean("settings.mobs.pigmen.dont-target-unless-hit", pigmenDontTargetUnlessHit);
}

6
patches/server/0052-Don-t-recalculate-permissions-for-players-on-world-c.patch
View File

@@ -1,4 +1,4 @@
From 25499ab7fd33b9297aae7e93cb07fd9d7f844c89 Mon Sep 17 00:00:00 2001
From 9bba75e2a35134a30c1f0df816ae3d2e2d834c6c Mon Sep 17 00:00:00 2001
From: Tom <cryptite@gmail.com>
Date: Fri, 12 Jul 2019 07:59:35 -0500
Subject: [PATCH] Don't recalculate permissions for players on world change
@@ -30,10 +30,10 @@ index 3cb443c4f..a33285379 100644
GameProfile gameprofile = entityplayer.getProfile();
int i = this.server.a(gameprofile);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 01c9d0861..20231143e 100644
index 594c50a18..af76bbc3b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -166,6 +166,11 @@ public class PurpurConfig {
@@ -171,6 +171,11 @@ public class PurpurConfig {
useBetterMending = getBoolean("settings.use-better-mending", useBetterMending);
}

6
patches/server/0053-Add-blacklist-option-for-grindstone.patch
View File

@@ -1,4 +1,4 @@
From 030ba500b2c8fa0f513540507b027038ed8a6860 Mon Sep 17 00:00:00 2001
From 4b7576a0ebb52b99eda351bc4d593158b72c5e0f Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 1 Aug 2019 19:15:12 -0500
Subject: [PATCH] Add blacklist option for grindstone
@@ -68,7 +68,7 @@ index 43e89b99b..e538ba399 100644
return this.getItem().f(this);
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 20231143e..ee83df5cc 100644
index af76bbc3b..e2b252685 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -1,6 +1,7 @@
@@ -79,7 +79,7 @@ index 20231143e..ee83df5cc 100644
import net.minecraft.server.Block;
import net.minecraft.server.IRegistry;
import net.minecraft.server.MinecraftKey;
@@ -171,6 +172,17 @@ public class PurpurConfig {
@@ -176,6 +177,17 @@ public class PurpurConfig {
updatePermissionsOnWorldChange = getBoolean("settings.update-perms-on-world-change", updatePermissionsOnWorldChange);
}

6
patches/server/0056-Add-option-for-zombies-targetting-turtle-eggs.patch
View File

@@ -1,4 +1,4 @@
From 0328d210600672ab34ff98907333c8f0e39ada6f Mon Sep 17 00:00:00 2001
From fd70dff76d52c53afca8555871d9840e79435886 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 17 Aug 2019 15:27:09 -0500
Subject: [PATCH] Add option for zombies targetting turtle eggs
@@ -22,10 +22,10 @@ index 96676a786..b426941f5 100644
this.goalSelector.a(8, new PathfinderGoalRandomLookaround(this));
this.l();
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 973cf6586..4f6df3ba6 100644
index e2b252685..c548af4bf 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -259,6 +259,11 @@ public class PurpurConfig {
@@ -264,6 +264,11 @@ public class PurpurConfig {
villagerBrainTicks = getInt("settings.mobs.villager.brain-ticks", villagerBrainTicks);
}

6
patches/server/0058-Option-for-slimes-not-pushable.patch
View File

@@ -1,4 +1,4 @@
From 51c6e0b1fa1ac7f9eac376a30d2ad37f88e45569 Mon Sep 17 00:00:00 2001
From 57476275f6d8d2db86a75b2e1cf0fe5d8a899832 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 23 Aug 2019 21:56:31 -0500
Subject: [PATCH] Option for slimes not pushable
@@ -23,10 +23,10 @@ index fd54958f6..0f4cdd5ed 100644
+ }
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 4f6df3ba6..14930aea7 100644
index c548af4bf..868271fa1 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -281,6 +281,17 @@ public class PurpurConfig {
@@ -286,6 +286,17 @@ public class PurpurConfig {
InventoryType.BARREL.setDefaultSize(packedBarrels ? 54 : 27);
}

8
patches/server/0059-Ender-Dragon-always-drops-full-exp.patch
View File

@@ -1,4 +1,4 @@
From 58354b185e7f9cc352e79508fd3f2cff1d75af9a Mon Sep 17 00:00:00 2001
From 2774159720ce020a94f34d6a8a5c44cb89922ae2 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 24 Aug 2019 14:42:54 -0500
Subject: [PATCH] Ender Dragon always drops full exp
@@ -22,10 +22,10 @@ index 6a6367a2e..578676fec 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 14930aea7..46c31ad1c 100644
index 868271fa1..bb0cf2d0a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -194,6 +194,7 @@ public class PurpurConfig {
@@ -199,6 +199,7 @@ public class PurpurConfig {
}
public static boolean enderDragonAlwaysDropsEggBlock = false;
@@ -33,7 +33,7 @@ index 14930aea7..46c31ad1c 100644
private static void enderDragonSettings() {
if (version < 2) {
boolean oldValue = config.getBoolean("ender-dragon-death-always-places-egg-block", enderDragonAlwaysDropsEggBlock);
@@ -202,6 +203,7 @@ public class PurpurConfig {
@@ -207,6 +208,7 @@ public class PurpurConfig {
set("settings.mobs.ender-dragon.always-drop-egg-block", oldValue);
}
enderDragonAlwaysDropsEggBlock = getBoolean("settings.mobs.ender-dragon.always-drop-egg-block", enderDragonAlwaysDropsEggBlock);

6
patches/server/0062-Add-killer-rabbit-natural-spawn-chance.patch
View File

@@ -1,4 +1,4 @@
From f722064d889392fd7040a2c420c76d1647582ae0 Mon Sep 17 00:00:00 2001
From 3c184c82e01b27e062f41077a7b73686ae9a98e0 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 31 Aug 2019 17:24:41 -0500
Subject: [PATCH] Add killer rabbit natural spawn chance
@@ -22,10 +22,10 @@ index d48610df3..498c453d7 100644
int i = this.random.nextInt(100);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 46c31ad1c..d03b96bcc 100644
index bb0cf2d0a..48a8907db 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -247,6 +247,11 @@ public class PurpurConfig {
@@ -252,6 +252,11 @@ public class PurpurConfig {
disablePillagerPatrols = getBoolean("settings.mobs.pillager.disable-patrols", disablePillagerPatrols);
}