Fork/mmocore
2
0
Fork 0
forked from Upstream/mmocore
Code Pull Requests Activity

Added npc check for player fish event, fixes issue #117.

Browse Source
This commit is contained in:
Ethan 2020-07-28 00:30:15 -04:00
parent b2699ef313
commit e90ceab393
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/Indyuce/mmocore/listener/profession/FishingListener.java
View File

@ -41,7 +41,7 @@ public class FishingListener implements Listener {
Player player = event.getPlayer(); Player player = event.getPlayer();
FishHook hook = event.getHook(); FishHook hook = event.getHook();
if (event.getState() == State.BITE && !fishing.contains(player.getUniqueId())) { if (event.getState() == State.BITE && !fishing.contains(player.getUniqueId()) && !player.hasMetadata("NPC")) {
/* /*
* checks for drop tables. if no drop table, just plain vanilla * checks for drop tables. if no drop table, just plain vanilla
@ -118,7 +118,7 @@ public class FishingListener implements Listener {
@EventHandler @EventHandler
public void a(PlayerFishEvent event) { public void a(PlayerFishEvent event) {
if (event.getPlayer().equals(player) && (event.getState() == State.CAUGHT_FISH || event.getState() == State.FAILED_ATTEMPT || (MMOLib.plugin.getVersion().isStrictlyHigher(1, 12) ? event.getState() == State.valueOf("REEL_IN") : false))) { if (event.getPlayer().equals(player) && !player.hasMetadata("NPC") && (event.getState() == State.CAUGHT_FISH || event.getState() == State.FAILED_ATTEMPT || (MMOLib.plugin.getVersion().isStrictlyHigher(1, 12) ? event.getState() == State.valueOf("REEL_IN") : false))) {
/* /*
* lose the catch if the current fish is gone! * lose the catch if the current fish is gone!