From 51cf76f0385545b264fb255eda8190ed4e3af529 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 7 Jul 2019 19:22:13 -0500 Subject: [PATCH] Add reeds to the MC-113809 fix --- ...reeds-chorus-fruit-on-random-tick-M.patch} | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) rename patches/server/{0044-Only-grow-cactus-chorus-fruit-on-random-tick-MC-1138.patch => 0044-Only-grow-cactus-reeds-chorus-fruit-on-random-tick-M.patch} (79%) diff --git a/patches/server/0044-Only-grow-cactus-chorus-fruit-on-random-tick-MC-1138.patch b/patches/server/0044-Only-grow-cactus-reeds-chorus-fruit-on-random-tick-M.patch similarity index 79% rename from patches/server/0044-Only-grow-cactus-chorus-fruit-on-random-tick-MC-1138.patch rename to patches/server/0044-Only-grow-cactus-reeds-chorus-fruit-on-random-tick-M.patch index 6e6104424..26db87c66 100644 --- a/patches/server/0044-Only-grow-cactus-chorus-fruit-on-random-tick-MC-1138.patch +++ b/patches/server/0044-Only-grow-cactus-reeds-chorus-fruit-on-random-tick-M.patch @@ -1,14 +1,16 @@ -From 8d9d3cfcfde5a50364e88253afe35a82af735edb Mon Sep 17 00:00:00 2001 +From 7601da03bdf749116f19ba3234274d0207f63a61 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Thu, 16 May 2019 01:33:46 +0100 -Subject: [PATCH] Only grow cactus/chorus fruit on random tick (MC-113809) +Subject: [PATCH] Only grow cactus/reeds/chorus fruit on random tick + (MC-113809) --- src/main/java/net/minecraft/server/Block.java | 1 + src/main/java/net/minecraft/server/BlockCactus.java | 1 + 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 ++ - 4 files changed, 5 insertions(+) + 5 files changed, 6 insertions(+) diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java index 8e16162a7..9b17269e6 100644 @@ -46,6 +48,18 @@ index 74fa4889f..bbda083f6 100644 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..4a13e248e 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 (!randomTick) return; // Purpur - 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 548e4e02d..17c8f9ff8 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java