From 877bf7905b7e9ca0980ed993bfe4249947291ad5 Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Tue, 14 Feb 2012 14:27:05 -0800
Subject: [PATCH] Fix for Green Terra not planting wheat.

---
 .../com/gmail/nossr50/listeners/mcBlockListener.java |  7 +++++--
 .../java/com/gmail/nossr50/skills/Herbalism.java     | 12 ++++++++----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java b/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java
index 7d4d3853e..5302134b9 100644
--- a/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java
@@ -169,7 +169,7 @@ public class mcBlockListener implements Listener
    		//Wheat && Triple drops
    		if(PP.getGreenTerraMode() && Herbalism.canBeGreenTerra(block))
    		{
-   			Herbalism.herbalismProcCheck(block, player, event, plugin);
+   			Herbalism.herbalismProcCheck(block, player, event, plugin, true);
    			Herbalism.greenTerraWheat(player, block, event, plugin);
    		}
    		
@@ -275,8 +275,9 @@ public class mcBlockListener implements Listener
     	{
     		Herbalism.greenTerraCheck(player, block);
     	}
+    	
     	if(mcPermissions.getInstance().herbalism(player) && block.getData() != (byte) 5)
-			Herbalism.herbalismProcCheck(block, player, event, plugin);
+			Herbalism.herbalismProcCheck(block, player, event, plugin, false);
     	
     	//Change the byte back when broken
     	if(block.getData() == 5 && m.shouldBeWatched(block))
@@ -287,6 +288,8 @@ public class mcBlockListener implements Listener
     			plugin.misc.blockWatchList.remove(block);
     		}
     	}
+    	
+    	//System.out.println("DEBUG: "+event.isCancelled()+", BLOCK_TYPE: "+event.getBlock().getType().toString()+", BLOCK_DATA: "+event.getBlock().getData());
     }
 
     @EventHandler(priority = EventPriority.HIGHEST)
diff --git a/src/main/java/com/gmail/nossr50/skills/Herbalism.java b/src/main/java/com/gmail/nossr50/skills/Herbalism.java
index f5e4212e2..4e73ea7be 100644
--- a/src/main/java/com/gmail/nossr50/skills/Herbalism.java
+++ b/src/main/java/com/gmail/nossr50/skills/Herbalism.java
@@ -72,6 +72,7 @@ public class Herbalism
 	    	
 	    }
 	}
+	
 	public static void greenTerraWheat(Player player, Block block, BlockBreakEvent event, mcMMO plugin)
 	{
 		if(block.getType() == Material.WHEAT && block.getData() == (byte) 0x07)
@@ -89,8 +90,8 @@ public class Herbalism
 			is = new ItemStack(mat, 1, (byte)0, (byte)0);
 			m.mcDropItem(loc, is);
 			
-	    	herbalismProcCheck(block, player, event, plugin);
-	    	herbalismProcCheck(block, player, event, plugin);
+	    	herbalismProcCheck(block, player, event, plugin, true);
+	    	herbalismProcCheck(block, player, event, plugin, true);
 			block.setData((byte) 0x03);
 		}
 	}
@@ -116,6 +117,7 @@ public class Herbalism
     	int t = block.getTypeId();
     	return t == 103 || t == 4 || t == 3 || t == 59 || t == 81 || t == 83 || t == 91 || t == 86 || t == 39 || t == 46 || t == 37 || t == 38;
     }
+	
 	public static boolean hasSeeds(Player player){
     	ItemStack[] inventory = player.getInventory().getContents();
     	for(ItemStack x : inventory){
@@ -125,6 +127,7 @@ public class Herbalism
     	}
     	return false;
     }
+	
 	public static void removeSeeds(Player player){
     	ItemStack[] inventory = player.getInventory().getContents();
     	for(ItemStack x : inventory){
@@ -141,7 +144,8 @@ public class Herbalism
     		}
     	}
     }
-	public static void herbalismProcCheck(Block block, Player player, BlockBreakEvent event, mcMMO plugin)
+	
+	public static void herbalismProcCheck(Block block, Player player, BlockBreakEvent event, mcMMO plugin, boolean isGreenTerra)
 	{
 		PlayerProfile PP = Users.getProfile(player);
 		int herbLevel = PP.getSkillLevel(SkillType.HERBALISM);
@@ -167,7 +171,7 @@ public class Herbalism
 	    			m.mcDropItem(loc, is);
     		}
     		//GREEN THUMB
-    		if(herbLevel > 1500 || (Math.random() * 1500 <= herbLevel))
+    		if(!isGreenTerra && (herbLevel > 1500 || (Math.random() * 1500 <= herbLevel)))
     		{
     			event.setCancelled(true);
     			m.mcDropItem(loc, is);