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 64b61aedf..7304a8ce6 100644 --- a/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java +++ b/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java @@ -134,9 +134,6 @@ public class HerbalismManager extends SkillManager { } } else { - if (!BlockUtils.isHarvestable(blockState)) - return; - xp = ExperienceConfig.getInstance().getXp(skill, blockState.getType()); if (Config.getInstance().getDoubleDropsEnabled(skill, material) && Permissions.secondaryAbilityEnabled(player, SecondaryAbility.HERBALISM_DOUBLE_DROPS)) { @@ -260,6 +257,9 @@ public class HerbalismManager extends SkillManager { * @param greenTerra boolean to determine if greenTerra is active or not */ private void processGreenThumbPlants(BlockState blockState, boolean greenTerra) { + if (!BlockUtils.isFullyGrown(blockState)) + return; + Player player = getPlayer(); PlayerInventory playerInventory = player.getInventory(); Material seed = null; diff --git a/src/main/java/com/gmail/nossr50/util/BlockUtils.java b/src/main/java/com/gmail/nossr50/util/BlockUtils.java index aadb7f9c8..faa682908 100644 --- a/src/main/java/com/gmail/nossr50/util/BlockUtils.java +++ b/src/main/java/com/gmail/nossr50/util/BlockUtils.java @@ -355,15 +355,13 @@ public final class BlockUtils { return transparentBlocks; } - public static boolean isHarvestable(BlockState blockState) { + public static boolean isFullyGrown(BlockState blockState) { BlockData data = blockState.getBlockData(); if (data.getMaterial() == Material.CACTUS || data.getMaterial() == Material.SUGAR_CANE) return true; if (data instanceof Ageable) { Ageable ageable = (Ageable) data; - mcMMO.p.debug(ageable.getAge() + "/" + ageable.getMaximumAge()); - System.out.println(ageable.getAge() + "/" + ageable.getMaximumAge()); return ageable.getAge() == ageable.getMaximumAge(); } return true;