EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-26 07:06:45 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4229 from Ineusia/issue-4224

Browse Source 
Handle Fishing Event even if FishingExploitFix is set to false
This commit is contained in:
Robert Alan Chapton 2020-07-25 08:38:04 -07:00 committed by GitHub
commit 1df2225aa2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -396,11 +396,9 @@ public class PlayerListener implements Listener {
} }
return; return;
case CAUGHT_FISH: case CAUGHT_FISH:
if(ExperienceConfig.getInstance().isFishingExploitingPrevented()) if(caught instanceof Item) {
{ if(ExperienceConfig.getInstance().isFishingExploitingPrevented()) {
if(caught instanceof Item) { if (fishingManager.isExploitingFishing(event.getHook().getLocation().toVector())) {
if(fishingManager.isExploitingFishing(event.getHook().getLocation().toVector()))
{
player.sendMessage(LocaleLoader.getString("Fishing.ScarcityTip", 3)); player.sendMessage(LocaleLoader.getString("Fishing.ScarcityTip", 3));
event.setExpToDrop(0); event.setExpToDrop(0);
Item caughtItem = (Item) caught; Item caughtItem = (Item) caught;
@ -408,10 +406,10 @@ public class PlayerListener implements Listener {
return; return;
} }
fishingManager.handleFishing((Item) caught);
fishingManager.setFishingTarget();
} }
fishingManager.handleFishing((Item) caught);
fishingManager.setFishingTarget();
} }
return; return;
case CAUGHT_ENTITY: case CAUGHT_ENTITY: