From e31b7d5c48d30f0e79bfc1aaf954cd7d3b9236fa Mon Sep 17 00:00:00 2001
From: GJ <gjmcferrin@gmail.com>
Date: Fri, 8 Mar 2013 08:53:54 -0500
Subject: [PATCH] Cacti & Sugar Cane are an exception, because the bottom block
 is normally player-placed but the top two are grown naturally.

---
 .../com/gmail/nossr50/skills/herbalism/HerbalismManager.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java b/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java
index 818c91dfa..ea90412c9 100644
--- a/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java
@@ -113,11 +113,12 @@ public class HerbalismManager extends SkillManager {
      * @param blockState The {@link BlockState} to check ability activation for
      */
     public void herbalismBlockCheck(BlockState blockState) {
-        if (mcMMO.placeStore.isTrue(blockState)) {
+        Material material = blockState.getType();
+
+        if (mcMMO.placeStore.isTrue(blockState) && (material != Material.CACTUS || material != Material.SUGAR_CANE_BLOCK)) {
             return;
         }
 
-        Material material = blockState.getType();
         HerbalismBlock herbalismBlock = HerbalismBlock.getHerbalismBlock(material);
         ItemStack drop = null;
         int amount = 1;