From 6d2003d57788f528bf3cbbf8e8953c0bfd28f360 Mon Sep 17 00:00:00 2001 From: ezeiger92 Date: Thu, 15 Feb 2018 13:59:10 -0800 Subject: [PATCH] Remove offhand fishing rod if not in main hand Fixes mcMMO-Dev/mcMMO#3342 Fixed style error in last commit --- .../java/com/gmail/nossr50/skills/fishing/FishingManager.java | 3 +++ src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java b/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java index 59e8b93cc..1322ee934 100644 --- a/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java +++ b/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java @@ -134,6 +134,9 @@ public class FishingManager extends SkillManager { if (player.getInventory().getItemInMainHand().getType() == Material.FISHING_ROD) { player.getInventory().setItemInMainHand(null); } + else if (player.getInventory().getItemInOffHand().getType() == Material.FISHING_ROD) { + player.getInventory().setItemInOffHand(null); + } LivingEntity kraken = (LivingEntity) world.spawnEntity(player.getEyeLocation(), (Misc.getRandom().nextInt(100) == 0 ? EntityType.CHICKEN : EntityType.SQUID)); kraken.setCustomName(AdvancedConfig.getInstance().getKrakenName()); diff --git a/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java b/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java index 860a60117..abf90f52f 100644 --- a/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java +++ b/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java @@ -188,7 +188,7 @@ public class SkillUtils { * @param maxDamageModifier the amount to adjust the max damage by */ public static void handleDurabilityChange(ItemStack itemStack, int durabilityModifier, double maxDamageModifier) { - if(itemStack.hasItemMeta() && itemStack.getItemMeta().isUnbreakable()) { + if (itemStack.hasItemMeta() && itemStack.getItemMeta().isUnbreakable()) { return; }