From c3e1cf868192f4e34854de767eb63dbd0813764a Mon Sep 17 00:00:00 2001
From: GJ <gjmcferrin@gmail.com>
Date: Thu, 8 Mar 2012 18:15:14 -0500
Subject: [PATCH] Another leak...

---
 Changelog.txt                                                | 1 +
 .../java/com/gmail/nossr50/listeners/mcBlockListener.java    | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Changelog.txt b/Changelog.txt
index 3e394d301..c726c6a29 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -16,6 +16,7 @@ Version 2.0.00-dev
  = Fixed issue with Blast Mining not seeing TNT for detonation due to snow
  = Fixed issue with block interaction returning NPEs
  = Fixed issue where every block broken had a mining check applied
+ = Fixed issue where every block broken had a herbalism check applied
  = Fixed issue where blocks weren't being removed from the watchlist
  ! Changed Call of the Wild to activate on left-click rather than right-click
  ! Changed Blast Mining to track based on Entity ID vs. Location
diff --git a/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java b/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java
index 22ed17372..0dccf4a7b 100644
--- a/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java
@@ -115,7 +115,7 @@ public class mcBlockListener implements Listener {
             Herbalism.herbalismProcCheck(block, player, event, plugin);
         }
 
-        if (mcPermissions.getInstance().herbalism(player) && block.getData() != (byte) 5) {
+        if (mcPermissions.getInstance().herbalism(player) && block.getData() != (byte) 0x5 && Herbalism.canBeGreenTerra(block)) {
             Herbalism.herbalismProcCheck(block, player, event, plugin);
         }
 
@@ -153,8 +153,7 @@ public class mcBlockListener implements Listener {
          * EXCAVATION
          */
 
-        if (Excavation.canBeGigaDrillBroken(block) && mcPermissions.getInstance().excavation(player) && block.getData() != (byte) 0x5)
-        {
+        if (Excavation.canBeGigaDrillBroken(block) && mcPermissions.getInstance().excavation(player) && block.getData() != (byte) 0x5) {
             if(LoadProperties.excavationRequiresShovel && ItemChecks.isShovel(inhand)) {
                 Excavation.excavationProcCheck(block, player);
             }