2019-04-23 04:47:07 +00:00
|
|
|
From 77786f5eecb8349c36a8926fa9f13a230c4594ec Mon Sep 17 00:00:00 2001
|
2016-02-29 23:09:49 +00:00
|
|
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
|
|
|
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
|
2019-04-23 04:47:07 +00:00
|
|
|
index a738657394..098bd3fba8 100644
|
2016-02-29 23:09:49 +00:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2018-07-24 00:24:44 +00:00
|
|
|
@@ -64,4 +64,13 @@ public class PaperWorldConfig {
|
2018-01-11 05:31:19 +00:00
|
|
|
config.addDefault("world-settings.default." + path, def);
|
|
|
|
return config.getString("world-settings." + worldName + "." + path, config.getString("world-settings.default." + path));
|
2016-02-29 23:09:49 +00:00
|
|
|
}
|
|
|
|
+
|
|
|
|
+ public int cactusMaxHeight;
|
|
|
|
+ public int reedMaxHeight;
|
2018-01-11 05:31:19 +00:00
|
|
|
+ private void blockGrowthHeight() {
|
2016-02-29 23:09:49 +00:00
|
|
|
+ cactusMaxHeight = getInt("max-growth-height.cactus", 3);
|
|
|
|
+ reedMaxHeight = getInt("max-growth-height.reeds", 3);
|
|
|
|
+ log("Max height for cactus growth " + cactusMaxHeight + ". Max height for reed growth " + reedMaxHeight);
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java
|
2019-04-23 04:47:07 +00:00
|
|
|
index 625b9a049f..b6806d8db3 100644
|
2016-02-29 23:09:49 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/BlockCactus.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/BlockCactus.java
|
2018-07-15 01:53:17 +00:00
|
|
|
@@ -29,7 +29,7 @@ public class BlockCactus extends Block {
|
|
|
|
;
|
|
|
|
}
|
2016-02-29 23:09:49 +00:00
|
|
|
|
2018-07-15 01:53:17 +00:00
|
|
|
- if (i < 3) {
|
2016-02-29 23:09:49 +00:00
|
|
|
+ if (i < world.paperConfig.cactusMaxHeight) { // Paper - Configurable growth height
|
2018-12-08 10:09:55 +00:00
|
|
|
int j = (Integer) iblockdata.get(BlockCactus.AGE);
|
2016-02-29 23:09:49 +00:00
|
|
|
|
2018-07-15 01:53:17 +00:00
|
|
|
if (j >= (byte) range(3, ((100.0F / world.spigotConfig.cactusModifier) * 15) + 0.5F, 15)) { // Spigot
|
2016-02-29 23:09:49 +00:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/BlockReed.java b/src/main/java/net/minecraft/server/BlockReed.java
|
2019-04-23 04:47:07 +00:00
|
|
|
index fad1a0a83c..c7017c58e7 100644
|
2016-02-29 23:09:49 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/BlockReed.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/BlockReed.java
|
2018-07-15 01:53:17 +00:00
|
|
|
@@ -25,7 +25,7 @@ public class BlockReed extends Block {
|
|
|
|
;
|
|
|
|
}
|
2016-02-29 23:09:49 +00:00
|
|
|
|
2018-07-15 01:53:17 +00:00
|
|
|
- if (i < 3) {
|
2016-02-29 23:09:49 +00:00
|
|
|
+ if (i < world.paperConfig.reedMaxHeight) { // Paper - Configurable growth height
|
2018-12-08 10:09:55 +00:00
|
|
|
int j = (Integer) iblockdata.get(BlockReed.AGE);
|
2016-02-29 23:09:49 +00:00
|
|
|
|
2018-07-15 01:53:17 +00:00
|
|
|
if (j >= (byte) range(3, ((100.0F / world.spigotConfig.caneModifier) * 15) + 0.5F, 15)) { // Spigot
|
2016-02-29 23:09:49 +00:00
|
|
|
--
|
2019-04-23 04:47:07 +00:00
|
|
|
2.21.0
|
2016-02-29 23:09:49 +00:00
|
|
|
|