Cactus Cactus Cactus Cactus Cactus

By: md_5 <md_5@live.com.au>

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;