2014-06-22 22:38:49 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
|
2016-03-01 00:09:49 +01:00
|
|
|
Date: Tue, 1 Mar 2016 13:02:51 -0600
|
2014-06-22 22:38:49 +02:00
|
|
|
Subject: [PATCH] Configurable cactus and reed natural growth heights
|
|
|
|
|
|
|
|
|
2016-03-01 00:09:49 +01:00
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2018-01-11 06:31:19 +01:00
|
|
|
index 621bf705..4a692ac1 100644
|
2016-03-01 00:09:49 +01:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
|
|
@@ -0,0 +0,0 @@ public class PaperWorldConfig {
|
2018-01-11 06:31:19 +01:00
|
|
|
config.addDefault("world-settings.default." + path, def);
|
|
|
|
return config.getString("world-settings." + worldName + "." + path, config.getString("world-settings.default." + path));
|
2016-03-01 00:09:49 +01:00
|
|
|
}
|
|
|
|
+
|
|
|
|
+ public int cactusMaxHeight;
|
|
|
|
+ public int reedMaxHeight;
|
2018-01-11 06:31:19 +01:00
|
|
|
+ private void blockGrowthHeight() {
|
2016-03-01 00:09:49 +01: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);
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
}
|
2014-06-22 22:38:49 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java
|
2018-01-11 06:31:19 +01:00
|
|
|
index 64b7d08f..d8fb87f7 100644
|
2014-06-22 22:38:49 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/BlockCactus.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/BlockCactus.java
|
|
|
|
@@ -0,0 +0,0 @@ public class BlockCactus extends Block {
|
|
|
|
;
|
|
|
|
}
|
|
|
|
|
2014-11-28 02:17:45 +01:00
|
|
|
- if (i < 3) {
|
2016-03-01 00:09:49 +01:00
|
|
|
+ if (i < world.paperConfig.cactusMaxHeight) { // Paper - Configurable growth height
|
2014-11-28 02:17:45 +01:00
|
|
|
int j = ((Integer) iblockdata.get(BlockCactus.AGE)).intValue();
|
2014-06-22 22:38:49 +02:00
|
|
|
|
2016-03-26 00:21:38 +01:00
|
|
|
if (j >= (byte) range(3, ((100.0F / world.spigotConfig.cactusModifier) * 15) + 0.5F, 15)) { // Spigot
|
2014-06-22 22:38:49 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/BlockReed.java b/src/main/java/net/minecraft/server/BlockReed.java
|
2018-01-11 06:31:19 +01:00
|
|
|
index 57f24f55..d19dce83 100644
|
2014-06-22 22:38:49 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/BlockReed.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/BlockReed.java
|
|
|
|
@@ -0,0 +0,0 @@ public class BlockReed extends Block {
|
|
|
|
;
|
|
|
|
}
|
|
|
|
|
2014-11-28 02:17:45 +01:00
|
|
|
- if (i < 3) {
|
2016-03-01 00:09:49 +01:00
|
|
|
+ if (i < world.paperConfig.reedMaxHeight) { // Paper - Configurable growth height
|
2014-11-28 02:17:45 +01:00
|
|
|
int j = ((Integer) iblockdata.get(BlockReed.AGE)).intValue();
|
2014-06-22 22:38:49 +02:00
|
|
|
|
2016-03-26 00:21:38 +01:00
|
|
|
if (j >= (byte) range(3, ((100.0F / world.spigotConfig.caneModifier) * 15) + 0.5F, 15)) { // Spigot
|
2015-03-08 02:16:09 +01:00
|
|
|
--
|