From 129b1eaf2964576edd3459e70c7e18388a740cfc Mon Sep 17 00:00:00 2001 From: PikaMug <2267126+PikaMug@users.noreply.github.com> Date: Sat, 16 Jan 2021 01:47:06 -0500 Subject: [PATCH] Only progress fish objective if actually caught, per #1559 --- .../quests/listeners/PlayerListener.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java b/main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java index ec2f87730..a46d6ba63 100644 --- a/main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java +++ b/main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java @@ -750,16 +750,17 @@ public class PlayerListener implements Listener { continue; } - if (quester.getCurrentQuests().containsKey(quest) - && quester.getCurrentStage(quest).containsObjective(type) - && evt.getState().equals(State.CAUGHT_FISH)) { - quester.catchFish(quest); + if (evt.getState().equals(State.CAUGHT_FISH)) { + if (quester.getCurrentQuests().containsKey(quest) + && quester.getCurrentStage(quest).containsObjective(type)) { + quester.catchFish(quest); + } + + quester.dispatchMultiplayerEverything(quest, type, (final Quester q, final Quest cq) -> { + q.catchFish(cq); + return null; + }); } - - quester.dispatchMultiplayerEverything(quest, type, (final Quester q, final Quest cq) -> { - q.catchFish(cq); - return null; - }); } } }