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

54 lines
2.6 KiB
Diff
Raw Normal View History

2015-03-08 02:16:09 +01:00
From 5ac0e55838b5e0bf667cc3759af1e2744eea2a2a Mon Sep 17 00:00:00 2001
2015-01-29 22:25:50 +01:00
From: Zach Brown <zach.brown@destroystokyo.com>
2015-03-08 02:16:09 +01:00
Date: Sat, 7 Mar 2015 20:32:13 -0600
Subject: [PATCH] Configurable cactus and reed natural growth heights
diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java
2015-03-08 02:16:09 +01:00
index 488e5c2..ddc2135 100644
--- a/src/main/java/net/minecraft/server/BlockCactus.java
+++ b/src/main/java/net/minecraft/server/BlockCactus.java
2014-11-28 02:17:45 +01:00
@@ -26,7 +26,7 @@ public class BlockCactus extends Block {
;
}
2014-11-28 02:17:45 +01:00
- if (i < 3) {
2015-03-08 02:16:09 +01:00
+ if (i < world.paperSpigotConfig.cactusMaxHeight) { // PaperSpigot - Configurable max growth height for cactus blocks) {
2014-11-28 02:17:45 +01:00
int j = ((Integer) iblockdata.get(BlockCactus.AGE)).intValue();
2014-11-28 02:17:45 +01:00
if (j >= (byte) range(3, (world.growthOdds / 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
2015-03-08 02:16:09 +01:00
index d00067d..337f2c4 100644
--- a/src/main/java/net/minecraft/server/BlockReed.java
+++ b/src/main/java/net/minecraft/server/BlockReed.java
2014-11-28 02:17:45 +01:00
@@ -25,7 +25,7 @@ public class BlockReed extends Block {
;
}
2014-11-28 02:17:45 +01:00
- if (i < 3) {
2015-03-08 02:16:09 +01:00
+ if (i < world.paperSpigotConfig.reedMaxHeight) { // PaperSpigot - Configurable max growth height for reed blocks) {
2014-11-28 02:17:45 +01:00
int j = ((Integer) iblockdata.get(BlockReed.AGE)).intValue();
2014-11-28 02:17:45 +01:00
if (j >= (byte) range(3, (world.growthOdds / world.spigotConfig.caneModifier * 15) + 0.5F, 15)) { // Spigot
diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
2015-03-08 02:16:09 +01:00
index 2a84879..c8b428c 100644
--- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
+++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
2014-08-06 01:45:22 +02:00
@@ -97,4 +97,13 @@ public class PaperSpigotWorldConfig
playerBlockingDamageMultiplier = getFloat( "player-blocking-damage-multiplier", 0.5F );
2015-03-08 02:16:09 +01:00
log( "Player blocking damage multiplier set to " + playerBlockingDamageMultiplier );
}
+
2014-08-06 01:45:22 +02:00
+ public int cactusMaxHeight;
+ public int reedMaxHeight;
+ private void blockGrowthHeight()
+ {
+ cactusMaxHeight = getInt( "max-growth-height.cactus", 3 );
2014-08-06 01:45:22 +02:00
+ reedMaxHeight = getInt( "max-growth-height.reeds", 3 );
2015-03-08 02:16:09 +01:00
+ log( "Max height for cactus growth " + cactusMaxHeight + ". Max height for reed growth " + reedMaxHeight );
+ }
}
--
2015-03-08 02:16:09 +01:00
1.9.1