aboutsummaryrefslogtreecommitdiffhomepage
path: root/Spigot-Server-Patches/0010-Configurable-cactus-and-reed-natural-growth-heights.patch
diff options
context:
space:
mode:
authorShane Freeder <[email protected]>2019-04-23 05:47:07 +0100
committerShane Freeder <[email protected]>2019-04-23 10:35:52 +0100
commit6c3f04049d7a50408fa377b0ec36e47c9348dfeb (patch)
tree852f0e242997a2afcbd6e49573ece7a049ed98ac /Spigot-Server-Patches/0010-Configurable-cactus-and-reed-natural-growth-heights.patch
parentfb25dc17c62acce335346d5e96899257ae7230c7 (diff)
downloadPaper-6c3f04049d7a50408fa377b0ec36e47c9348dfeb.tar.gz
Paper-6c3f04049d7a50408fa377b0ec36e47c9348dfeb.zip
Initial work on 1.14 pre-5
Diffstat (limited to 'Spigot-Server-Patches/0010-Configurable-cactus-and-reed-natural-growth-heights.patch')
-rw-r--r--Spigot-Server-Patches/0010-Configurable-cactus-and-reed-natural-growth-heights.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/Spigot-Server-Patches/0010-Configurable-cactus-and-reed-natural-growth-heights.patch b/Spigot-Server-Patches/0010-Configurable-cactus-and-reed-natural-growth-heights.patch
index 27fbb8ca54..9a14f99fe9 100644
--- a/Spigot-Server-Patches/0010-Configurable-cactus-and-reed-natural-growth-heights.patch
+++ b/Spigot-Server-Patches/0010-Configurable-cactus-and-reed-natural-growth-heights.patch
@@ -1,11 +1,11 @@
-From a33afed850b70f0bb7a2da14d0ea528dad769f8a Mon Sep 17 00:00:00 2001
+From 77786f5eecb8349c36a8926fa9f13a230c4594ec Mon Sep 17 00:00:00 2001
From: Zach Brown <[email protected]>
Date: Tue, 1 Mar 2016 13:02:51 -0600
Subject: [PATCH] Configurable cactus and reed natural growth heights
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a73865739..098bd3fba 100644
+index a738657394..098bd3fba8 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -64,4 +64,13 @@ public class PaperWorldConfig {
@@ -23,7 +23,7 @@ index a73865739..098bd3fba 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java
-index 27758bd01..918db3626 100644
+index 625b9a049f..b6806d8db3 100644
--- a/src/main/java/net/minecraft/server/BlockCactus.java
+++ b/src/main/java/net/minecraft/server/BlockCactus.java
@@ -29,7 +29,7 @@ public class BlockCactus extends Block {
@@ -36,7 +36,7 @@ index 27758bd01..918db3626 100644
if (j >= (byte) range(3, ((100.0F / world.spigotConfig.cactusModifier) * 15) + 0.5F, 15)) { // Spigot
diff --git a/src/main/java/net/minecraft/server/BlockReed.java b/src/main/java/net/minecraft/server/BlockReed.java
-index fad1a0a83..c7017c58e 100644
+index fad1a0a83c..c7017c58e7 100644
--- a/src/main/java/net/minecraft/server/BlockReed.java
+++ b/src/main/java/net/minecraft/server/BlockReed.java
@@ -25,7 +25,7 @@ public class BlockReed extends Block {
@@ -49,5 +49,5 @@ index fad1a0a83..c7017c58e 100644
if (j >= (byte) range(3, ((100.0F / world.spigotConfig.caneModifier) * 15) + 0.5F, 15)) { // Spigot
--
-2.19.2
+2.21.0