From bddca30668be5c262e992a6c60a555dd30a536b2 Mon Sep 17 00:00:00 2001 From: Tslat Date: Sat, 5 Mar 2016 20:39:16 +1000 Subject: [PATCH] Fix infinite GreenThumb & ShroomThumb usage bug --- .../nossr50/skills/herbalism/HerbalismManager.java | 12 ++++++++++-- 1 file changed, 10 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 6131c5ae4..21c2d1e40 100644 --- a/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java +++ b/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java @@ -50,13 +50,21 @@ public class HerbalismManager extends SkillManager { public boolean canGreenThumbBlock(BlockState blockState) { Player player = getPlayer(); + ItemStack item = player.getInventory().getItemInMainHand(); + + if (item.getAmount() <= 0) + return false; - return player.getItemInHand().getType() == Material.SEEDS && BlockUtils.canMakeMossy(blockState) && Permissions.greenThumbBlock(player, blockState.getType()); + return item.getType() == Material.SEEDS && BlockUtils.canMakeMossy(blockState) && Permissions.greenThumbBlock(player, blockState.getType()); } public boolean canUseShroomThumb(BlockState blockState) { Player player = getPlayer(); - Material itemType = player.getItemInHand().getType(); + ItemStack item = player.getInventory().getItemInMainHand(); + Material itemType = item.getType(); + + if (item.getAmount() <= 0) + return false; return (itemType == Material.RED_MUSHROOM || itemType == Material.BROWN_MUSHROOM) && BlockUtils.canMakeShroomy(blockState) && Permissions.secondaryAbilityEnabled(player, SecondaryAbility.SHROOM_THUMB); }