Fixed the Cacti & Sugar Cane fix!

src/main/java/com/gmail/nossr50/skills/herbalism/Herbalism.java

@@ -63,7 +63,7 @@ public class Herbalism {
     protected static int calculateCatciAndSugarDrops(BlockState blockState) {
         Block block = blockState.getBlock();
         Material blockType = blockState.getType();
-        int dropAmount = 1;
+        int dropAmount = mcMMO.placeStore.isTrue(block) ? 0 : 1;
 
         // Handle the two blocks above it - cacti & sugar cane can only grow 3 high naturally
         for (int y = 1; y < 3; y++) {
@@ -73,7 +73,10 @@ public class Herbalism {
                 break;
             }
 
-            if (!mcMMO.placeStore.isTrue(relativeBlock)) {
+            if (mcMMO.placeStore.isTrue(relativeBlock)) {
+                mcMMO.placeStore.setFalse(relativeBlock);
+            }
+            else {
                 dropAmount++;
             }
         }

src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java

@@ -114,8 +114,9 @@ public class HerbalismManager extends SkillManager {
      */
     public void herbalismBlockCheck(BlockState blockState) {
         Material material = blockState.getType();
+        boolean oneBlockPlant = (material == Material.CACTUS || material == Material.SUGAR_CANE_BLOCK) ? false : true;
 
-        if (mcMMO.placeStore.isTrue(blockState) && (material != Material.CACTUS || material != Material.SUGAR_CANE_BLOCK)) {
+        if (oneBlockPlant && mcMMO.placeStore.isTrue(blockState)) {
             return;
         }
 
@@ -136,7 +137,7 @@ public class HerbalismManager extends SkillManager {
                 drop = herbalismBlock.getDropItem();
             }
 
-            if (material == Material.CACTUS || material == Material.SUGAR_CANE_BLOCK) {
+            if (!oneBlockPlant) {
                 amount = Herbalism.calculateCatciAndSugarDrops(blockState);
                 xp *= amount;
             }