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

From 381b93978d20e3a2aa75108b6bd18c00dd4152d1 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Fri, 28 Nov 2014 00:55:17 -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
index d9f6e0b..d0b1bcf 100644
--- a/src/main/java/net/minecraft/server/BlockCactus.java
+++ b/src/main/java/net/minecraft/server/BlockCactus.java
@@ -26,7 +26,7 @@ public class BlockCactus extends Block {
                 ;
             }
 
-            if (i < 3) {
+            if (i < world.paperSpigotConfig.cactusMaxHeight) { // PaperSpigot - Configurable max growth height for cactus blocks
                 int j = ((Integer) iblockdata.get(BlockCactus.AGE)).intValue();
 
                 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
index 27b7f81..d04de80 100644
--- a/src/main/java/net/minecraft/server/BlockReed.java
+++ b/src/main/java/net/minecraft/server/BlockReed.java
@@ -25,7 +25,7 @@ public class BlockReed extends Block {
                     ;
                 }
 
-                if (i < 3) {
+                if (i < world.paperSpigotConfig.reedMaxHeight) { // PaperSpigot - Configurable max growth height for reed blocks
                     int j = ((Integer) iblockdata.get(BlockReed.AGE)).intValue();
 
                     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
index 5cda463..0878ea7 100644
--- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
+++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
@@ -97,4 +97,13 @@ public class PaperSpigotWorldConfig
         playerBlockingDamageMultiplier = getFloat( "player-blocking-damage-multiplier", 0.5F );
         log( "Player blocking damage multiplier set to " + playerBlockingDamageMultiplier);
     }
+
+    public int cactusMaxHeight;
+    public int reedMaxHeight;
+    private void blockGrowthHeight()
+    {
+        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);
+    }
 }
-- 
1.9.5.msysgit.0