From d69fe6c511ba5483c4451aef7029259eaf9d7654 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 22 Sep 2019 23:07:01 -0500 Subject: [PATCH] Fix zero-tick instant grow farms MC-113809 (#2559) --- ...ro-tick-instant-grow-farms-MC-113809.patch | 99 +++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 Spigot-Server-Patches/0416-Fix-zero-tick-instant-grow-farms-MC-113809.patch diff --git a/Spigot-Server-Patches/0416-Fix-zero-tick-instant-grow-farms-MC-113809.patch b/Spigot-Server-Patches/0416-Fix-zero-tick-instant-grow-farms-MC-113809.patch new file mode 100644 index 0000000000..893e68c79f --- /dev/null +++ b/Spigot-Server-Patches/0416-Fix-zero-tick-instant-grow-farms-MC-113809.patch @@ -0,0 +1,99 @@ +From d359159139d014ae7bfcddab8b40691a98fceacd Mon Sep 17 00:00:00 2001 +From: William Blake Galbreath +Date: Sun, 15 Sep 2019 11:32:32 -0500 +Subject: [PATCH] Fix zero-tick instant grow farms MC-113809 + + +diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +index 246bb4b01..751e29bec 100644 +--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java ++++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +@@ -568,6 +568,11 @@ public class PaperWorldConfig { + disableRelativeProjectileVelocity = getBoolean("game-mechanics.disable-relative-projectile-velocity", false); + } + ++ public boolean fixZeroTickInstantGrowFarms = true; ++ private void fixZeroTickInstantGrowFarms() { ++ fixZeroTickInstantGrowFarms = getBoolean("fix-zero-tick-instant-grow-farms", fixZeroTickInstantGrowFarms); ++ } ++ + public boolean altItemDespawnRateEnabled; + public Map altItemDespawnRateMap; + private void altItemDespawnRate() { +diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java +index e077359b0..619237d68 100644 +--- a/src/main/java/net/minecraft/server/Block.java ++++ b/src/main/java/net/minecraft/server/Block.java +@@ -44,6 +44,7 @@ public class Block implements IMaterial { + private final float frictionFactor; + protected final BlockStateList blockStateList; + private IBlockData blockData; ++ public boolean randomTick = false; // Paper - fix MC-113809 + protected final boolean v; + private final boolean g; + @Nullable +diff --git a/src/main/java/net/minecraft/server/BlockBamboo.java b/src/main/java/net/minecraft/server/BlockBamboo.java +index ffb65776c..3a9c3b54a 100644 +--- a/src/main/java/net/minecraft/server/BlockBamboo.java ++++ b/src/main/java/net/minecraft/server/BlockBamboo.java +@@ -85,6 +85,7 @@ public class BlockBamboo extends Block implements IBlockFragilePlantElement { + if (!iblockdata.canPlace(world, blockposition)) { + world.b(blockposition, true); + } else if ((Integer) iblockdata.get(BlockBamboo.f) == 0) { ++ if (world.paperConfig.fixZeroTickInstantGrowFarms && !randomTick) return; // Paper - fix MC-113809 + if (world.random.nextInt(Math.max(1, (int) (100.0F / world.spigotConfig.bambooModifier) * 3)) == 0 && world.isEmpty(blockposition.up()) && world.getLightLevel(blockposition.up(), 0) >= 9) { // Spigot + int i = this.b((IBlockAccess) world, blockposition) + 1; + +diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java +index 29f9ff6c1..124b4b4b0 100644 +--- a/src/main/java/net/minecraft/server/BlockCactus.java ++++ b/src/main/java/net/minecraft/server/BlockCactus.java +@@ -21,6 +21,7 @@ public class BlockCactus extends Block { + if (!iblockdata.canPlace(world, blockposition)) { + world.b(blockposition, true); + } else { ++ if (world.paperConfig.fixZeroTickInstantGrowFarms && !randomTick) return; // Paper - fix MC-113809 + BlockPosition blockposition1 = blockposition.up(); + + if (world.isEmpty(blockposition1)) { +diff --git a/src/main/java/net/minecraft/server/BlockChorusFlower.java b/src/main/java/net/minecraft/server/BlockChorusFlower.java +index 74fa4889f..cde2524ca 100644 +--- a/src/main/java/net/minecraft/server/BlockChorusFlower.java ++++ b/src/main/java/net/minecraft/server/BlockChorusFlower.java +@@ -22,6 +22,7 @@ public class BlockChorusFlower extends Block { + if (!iblockdata.canPlace(world, blockposition)) { + world.b(blockposition, true); + } else { ++ if (world.paperConfig.fixZeroTickInstantGrowFarms && !randomTick) return; // Paper - fix MC-113809 + BlockPosition blockposition1 = blockposition.up(); + + if (world.isEmpty(blockposition1) && blockposition1.getY() < 256) { +diff --git a/src/main/java/net/minecraft/server/BlockReed.java b/src/main/java/net/minecraft/server/BlockReed.java +index ff674a9d5..a4850c070 100644 +--- a/src/main/java/net/minecraft/server/BlockReed.java ++++ b/src/main/java/net/minecraft/server/BlockReed.java +@@ -23,6 +23,7 @@ public class BlockReed extends Block { + if (!iblockdata.canPlace(world, blockposition)) { + world.b(blockposition, true); + } else if (world.isEmpty(blockposition.up())) { ++ if (world.paperConfig.fixZeroTickInstantGrowFarms && !randomTick) return; // Paper - fix MC-113809 + int i; + + 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 ee3789b38..7a0b657f2 100644 +--- a/src/main/java/net/minecraft/server/WorldServer.java ++++ b/src/main/java/net/minecraft/server/WorldServer.java +@@ -533,7 +533,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; // Paper - fix MC-113809 + iblockdata.b((World) this, blockposition2, this.random); ++ iblockdata.getBlock().randomTick = false; // Paper - fix MC-113809 + } + + Fluid fluid = iblockdata.p(); +-- +2.23.0.windows.1 +