Cactus Cactus Cactus Cactus Cactus

CraftBukkit-Patches/0006-Crop-Growth-Rates.patch

@@ -1,4 +1,4 @@
-From e1460ee5d26b7d86cf40f75297367ac293712e1b Mon Sep 17 00:00:00 2001
+From abf5bc5b131b439231197b1a3159b0dcdc3c82ec Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 17:17:20 +1000
 Subject: [PATCH] Crop Growth Rates
@@ -132,7 +132,7 @@ index 8339a35..c7e2344 100644
  
                  if (l < 7) {
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 123fb7a..a929766 100644
+index 123fb7a..3ec38a1 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -70,4 +70,36 @@ public class SpigotWorldConfig
@@ -154,22 +154,22 @@ index 123fb7a..a929766 100644
 +        log( "Cactus Growth Modifier: " + cactusModifier + "%" );
 +
 +        caneModifier = getInt( "growth.cane-modifier", 100 );
-+        log( "Cactus Growth Modifier: " + cactusModifier + "%" );
++        log( "Cane Growth Modifier: " + caneModifier + "%" );
 +
 +        melonModifier = getInt( "growth.melon-modifier", 100 );
-+        log( "Cactus Growth Modifier: " + cactusModifier + "%" );
++        log( "Melon Growth Modifier: " + melonModifier + "%" );
 +
 +        mushroomModifier = getInt( "growth.mushroom-modifier", 100 );
-+        log( "Cactus Growth Modifier: " + cactusModifier + "%" );
++        log( "Mushroom Growth Modifier: " + mushroomModifier + "%" );
 +
 +        pumpkinModifier = getInt( "growth.pumpkin-modifier", 100 );
-+        log( "Cactus Growth Modifier: " + cactusModifier + "%" );
++        log( "Pumpkin Growth Modifier: " + pumpkinModifier + "%" );
 +
 +        saplingModifier = getInt( "growth.sapling-modifier", 100 );
-+        log( "Cactus Growth Modifier: " + cactusModifier + "%" );
++        log( "Sapling Growth Modifier: " + saplingModifier + "%" );
 +
 +        wheatModifier = getInt( "growth.wheat-modifier", 100 );
-+        log( "Cactus Growth Modifier: " + cactusModifier + "%" );
++        log( "Wheat Growth Modifier: " + wheatModifier + "%" );
 +    }
  }
 -- 

CraftBukkit-Patches/0010-Merge-tweaks-and-configuration.patch

@@ -1,4 +1,4 @@
-From dcf6e48a2c498079f9c10f19242ee3a8869101d7 Mon Sep 17 00:00:00 2001
+From 7ec8ae26036858173a7c318944efa17ad2100cea Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 09:46:33 +1100
 Subject: [PATCH] Merge tweaks and configuration
@@ -69,12 +69,12 @@ index afe3e4d..97da2cd 100644
          if (event != null && (event.isCancelled() || entity.dead)) {
              entity.dead = true;
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index a929766..ea7c211 100644
+index 3ec38a1..8a6d656 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -102,4 +102,18 @@ public class SpigotWorldConfig
          wheatModifier = getInt( "growth.wheat-modifier", 100 );
-         log( "Cactus Growth Modifier: " + cactusModifier + "%" );
+         log( "Wheat Growth Modifier: " + wheatModifier + "%" );
      }
 +
 +    public double itemMerge;