aboutsummaryrefslogtreecommitdiffhomepage
path: root/Spigot-Server-Patches/0010-Configurable-cactus-and-reed-natural-growth-heights.patch
diff options
context:
space:
mode:
authorAikar <[email protected]>2020-06-25 05:27:25 -0400
committerAikar <[email protected]>2020-06-25 05:27:25 -0400
commit6800c77f75cfd834ff14ab1d28dc2dd8374d1a13 (patch)
treeb8b74c58c3cb5b160c03d604524bd3b6eb1b17a6 /Spigot-Server-Patches/0010-Configurable-cactus-and-reed-natural-growth-heights.patch
parente27149bff4cc569427ff82faa739bd03a3a5e703 (diff)
downloadPaper-6800c77f75cfd834ff14ab1d28dc2dd8374d1a13.tar.gz
Paper-6800c77f75cfd834ff14ab1d28dc2dd8374d1a13.zip
Current progress - Leaf, tag your it
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.patch18
1 files changed, 9 insertions, 9 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 dbef4cb010..2f721262cb 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
@@ -23,23 +23,23 @@ index a738657394bcccd859ef260a801736d44b234469..098bd3fba867c0e4c6c58748aa6e2e63
+ }
}
diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java
-index 1e1d02dc73ea193fca69b26e4c51efd845713d2f..e0974e256f0f10e047b9eb8e362982c6578d2d98 100644
+index 4a3049575ad78e1c75d1b43a35311974c1d489de..13e4517bd04096001ca1caf32b9949abb3cf9c7f 100644
--- a/src/main/java/net/minecraft/server/BlockCactus.java
+++ b/src/main/java/net/minecraft/server/BlockCactus.java
-@@ -30,7 +30,7 @@ public class BlockCactus extends Block {
- ;
- }
+@@ -35,7 +35,7 @@ public class BlockCactus extends Block {
+ ;
+ }
-- if (i < 3) {
+- if (i < 3) {
+ if (i < worldserver.paperConfig.cactusMaxHeight) { // Paper - Configurable growth height
- int j = (Integer) iblockdata.get(BlockCactus.AGE);
+ int j = (Integer) iblockdata.get(BlockCactus.AGE);
- if (j >= (byte) range(3, ((100.0F / worldserver.spigotConfig.cactusModifier) * 15) + 0.5F, 15)) { // Spigot
+ if (j >= (byte) range(3, ((100.0F / worldserver.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 2106b0b49f19f56fd446c2c6cec63526eb74fdb7..55b07444e1d769952f2a411b1b5d1032565af8a1 100644
+index 30282f73d263a96a14bd7bf7d3ac520e315b093a..c051decd19ff763a061822bc2a4b03289dfe3ac7 100644
--- a/src/main/java/net/minecraft/server/BlockReed.java
+++ b/src/main/java/net/minecraft/server/BlockReed.java
-@@ -29,7 +29,7 @@ public class BlockReed extends Block {
+@@ -35,7 +35,7 @@ public class BlockReed extends Block {
;
}