EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-23 05:36:46 +01:00
Code Issues Projects Releases Wiki Activity

Only check for kraken if you're actually fishing.

Browse Source
This commit is contained in:
GJ 2013-05-21 09:14:34 -04:00
parent 12e70490d8
commit 87df536a1f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/gmail/nossr50/listeners/PlayerListener.java
View File

@ -180,10 +180,10 @@ public class PlayerListener implements Listener {
case FISHING: case FISHING:
if (!Permissions.krakenBypass(player)) { if (!Permissions.krakenBypass(player)) {
event.setCancelled(fishingManager.exploitPrevention()); event.setCancelled(fishingManager.exploitPrevention());
}
if (event.isCancelled()) { if (event.isCancelled()) {
return; return;
}
} }
if (fishingManager.canMasterAngler()) { if (fishingManager.canMasterAngler()) {

4
src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java
View File

@ -143,12 +143,12 @@ public class FishingManager extends SkillManager {
} }
public boolean exploitPrevention() { public boolean exploitPrevention() {
if (!AdvancedConfig.getInstance().getKrakenEnabled()) { if (!AdvancedConfig.getInstance().getKrakenEnabled() || !getPlayer().getTargetBlock(null, 100).isLiquid()) {
return false; return false;
} }
long currentTime = System.currentTimeMillis(); long currentTime = System.currentTimeMillis();
boolean hasFished = currentTime < fishingTimestamp + FISHING_COOLDOWN_SECONDS; boolean hasFished = (currentTime < fishingTimestamp + FISHING_COOLDOWN_SECONDS);
fishingTries = hasFished ? fishingTries + 1 : Math.max(fishingTries - 1, 0); fishingTries = hasFished ? fishingTries + 1 : Math.max(fishingTries - 1, 0);
fishingTimestamp = currentTime; fishingTimestamp = currentTime;