Paper/Spigot-Server-Patches/0010-Configurable-cactus-and-reed-natural-growth-heights.patch

51 lines
2.6 KiB
Diff
Raw Normal View History

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2016-03-01 00:09:49 +01: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
index b31109d2dadd29e8852468c19265066b773d2be0..d97288b27668e0544b05ce110bfc6a0834cc263d 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
@@ -65,4 +65,13 @@ 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);
+
+ }
}
diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java
2020-06-25 11:27:25 +02:00
index 4a3049575ad78e1c75d1b43a35311974c1d489de..13e4517bd04096001ca1caf32b9949abb3cf9c7f 100644
2016-03-01 00:09:49 +01:00
--- a/src/main/java/net/minecraft/server/BlockCactus.java
+++ b/src/main/java/net/minecraft/server/BlockCactus.java
2020-06-25 11:27:25 +02:00
@@ -35,7 +35,7 @@ public class BlockCactus extends Block {
;
}
2016-03-01 00:09:49 +01:00
2020-06-25 11:27:25 +02:00
- if (i < 3) {
2019-12-12 19:45:00 +01:00
+ if (i < worldserver.paperConfig.cactusMaxHeight) { // Paper - Configurable growth height
2020-06-25 11:27:25 +02:00
int j = (Integer) iblockdata.get(BlockCactus.AGE);
2016-03-01 00:09:49 +01:00
2020-06-25 11:27:25 +02:00
if (j >= (byte) range(3, ((100.0F / worldserver.spigotConfig.cactusModifier) * 15) + 0.5F, 15)) { // Spigot
2016-03-01 00:09:49 +01:00
diff --git a/src/main/java/net/minecraft/server/BlockReed.java b/src/main/java/net/minecraft/server/BlockReed.java
2020-06-25 11:27:25 +02:00
index 30282f73d263a96a14bd7bf7d3ac520e315b093a..c051decd19ff763a061822bc2a4b03289dfe3ac7 100644
2016-03-01 00:09:49 +01:00
--- a/src/main/java/net/minecraft/server/BlockReed.java
+++ b/src/main/java/net/minecraft/server/BlockReed.java
2020-06-25 11:27:25 +02:00
@@ -35,7 +35,7 @@ public class BlockReed extends Block {
;
}
2016-03-01 00:09:49 +01:00
- if (i < 3) {
2019-12-12 19:45:00 +01:00
+ if (i < worldserver.paperConfig.reedMaxHeight) { // Paper - Configurable growth height
int j = (Integer) iblockdata.get(BlockReed.AGE);
2016-03-01 00:09:49 +01:00
2019-12-11 01:56:03 +01:00
if (j >= (byte) range(3, ((100.0F / worldserver.spigotConfig.caneModifier) * 15) + 0.5F, 15)) { // Spigot