Merge branch 'master' of github.com:ProgrammingAtDawn/mcMMO

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

@@ -148,10 +148,6 @@ public class HerbalismManager extends SkillManager {
             }
         }
         else {
-            if (Permissions.greenThumbPlant(player, material)) {
-                processGreenThumbPlants(blockState, greenTerra);
-            }
-
             if(material == Material.CHORUS_FLOWER && blockState.getRawData() != 5) {
                 return;
             }
@@ -165,6 +161,10 @@ public class HerbalismManager extends SkillManager {
                 amount = Herbalism.calculateMultiBlockPlantDrops(blockState);
                 xp *= amount;
             }
+            
+            if (Permissions.greenThumbPlant(player, material)) {
+                processGreenThumbPlants(blockState, greenTerra);
+            }
         }
 
         applyXpGain(xp, XPGainReason.PVE);