From 7e34e87bc0b0f0b608d8445966a4d27bfc89a817 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Sun, 27 Jan 2019 20:36:55 -0800 Subject: [PATCH] Magic Hunter stats now check for treasure hunter --- .../com/gmail/nossr50/commands/skills/FishingCommand.java | 4 ++-- .../com/gmail/nossr50/skills/fishing/FishingManager.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java index ce469d8fe..86457d623 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java @@ -74,7 +74,7 @@ public class FishingCommand extends SkillCommand { } } - if(totalEnchantChance > 0) + if(totalEnchantChance >= 1) magicChance = percent.format(totalEnchantChance / 100.0); else magicChance = percent.format(0); @@ -116,7 +116,7 @@ public class FishingCommand extends SkillCommand { @Override protected void permissionsCheck(Player player) { canTreasureHunt = canUseSubskill(player, SubSkillType.FISHING_TREASURE_HUNTER); - canMagicHunt = canUseSubskill(player, SubSkillType.FISHING_MAGIC_HUNTER); + canMagicHunt = canUseSubskill(player, SubSkillType.FISHING_MAGIC_HUNTER) && canUseSubskill(player, SubSkillType.FISHING_TREASURE_HUNTER); canShake = canUseSubskill(player, SubSkillType.FISHING_SHAKE); canFishermansDiet = canUseSubskill(player, SubSkillType.FISHING_FISHERMANS_DIET); canMasterAngler = canUseSubskill(player, SubSkillType.FISHING_MASTER_ANGLER); 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 07dcc4f93..9eb309477 100644 --- a/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java +++ b/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java @@ -38,7 +38,6 @@ import java.util.*; public class FishingManager extends SkillManager { private final long FISHING_COOLDOWN_SECONDS = 1000L; - private int fishingTries = 0; private long fishingTimestamp = 0L; private Location fishingTarget; private Item fishingCatch; @@ -73,6 +72,9 @@ public class FishingManager extends SkillManager { Location targetLocation = targetBlock.getLocation(); boolean sameTarget = (fishingTarget != null && fishingTarget.equals(targetLocation)); + if(!sameTarget) + fishingTarget = targetLocation; + return hasFished || sameTarget; } @@ -258,8 +260,6 @@ public class FishingManager extends SkillManager { * @param target The {@link LivingEntity} affected by the ability */ public void shakeCheck(LivingEntity target) { - fishingTries--; // Because autoclicking to shake is OK. - if (RandomChanceUtil.checkRandomChanceExecutionSuccess(getPlayer(), SubSkillType.FISHING_SHAKE, true)) { List possibleDrops = Fishing.findPossibleDrops(target);