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

Add reeds to the MC-113809 fix

Browse Source
This commit is contained in:
William Blake Galbreath
2019-07-07 19:22:13 -05:00
parent 26cac543f7
commit 51cf76f038
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/server/0044-Only-grow-cactus-chorus-fruit-on-random-tick-MC-1138.patch → patches/server/0044-Only-grow-cactus-reeds-chorus-fruit-on-random-tick-M.patch
View File

@@ -1,14 +1,16 @@
From 8d9d3cfcfde5a50364e88253afe35a82af735edb Mon Sep 17 00:00:00 2001 From 7601da03bdf749116f19ba3234274d0207f63a61 Mon Sep 17 00:00:00 2001
From: Phoenix616 <mail@moep.tv> From: Phoenix616 <mail@moep.tv>
Date: Thu, 16 May 2019 01:33:46 +0100 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/Block.java | 1 +
src/main/java/net/minecraft/server/BlockCactus.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/BlockChorusFlower.java | 1 +
src/main/java/net/minecraft/server/BlockReed.java | 1 +
src/main/java/net/minecraft/server/WorldServer.java | 2 ++ 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 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
index 8e16162a7..9b17269e6 100644 index 8e16162a7..9b17269e6 100644
@@ -46,6 +48,18 @@ index 74fa4889f..bbda083f6 100644
BlockPosition blockposition1 = blockposition.up(); BlockPosition blockposition1 = blockposition.up();
if (world.isEmpty(blockposition1) && blockposition1.getY() < 256) { 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 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 548e4e02d..17c8f9ff8 100644 index 548e4e02d..17c8f9ff8 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java --- a/src/main/java/net/minecraft/server/WorldServer.java