From 6b997cedb2bf691a7fb3551ed989a9fe8c500016 Mon Sep 17 00:00:00 2001 From: PikaMug <2267126+PikaMug@users.noreply.github.com> Date: Sun, 21 Mar 2021 20:34:34 -0400 Subject: [PATCH] QuesterPreCompleteQuestEvent may be triggered async, fixes #1658 --- main/src/main/java/me/blackvein/quests/Quest.java | 2 +- .../quests/events/quester/QuesterPreCompleteQuestEvent.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/main/src/main/java/me/blackvein/quests/Quest.java b/main/src/main/java/me/blackvein/quests/Quest.java index a6dcff5a8..7d2702068 100644 --- a/main/src/main/java/me/blackvein/quests/Quest.java +++ b/main/src/main/java/me/blackvein/quests/Quest.java @@ -524,7 +524,7 @@ public class Quest implements Comparable { public void completeQuest(final Quester q, final boolean allowMultiplayer) { final OfflinePlayer player = q.getOfflinePlayer(); if (player.isOnline()) { - final QuesterPreCompleteQuestEvent preEvent = new QuesterPreCompleteQuestEvent(q, this); + final QuesterPreCompleteQuestEvent preEvent = new QuesterPreCompleteQuestEvent(q, this, true); plugin.getServer().getPluginManager().callEvent(preEvent); if (preEvent.isCancelled()) { return; diff --git a/main/src/main/java/me/blackvein/quests/events/quester/QuesterPreCompleteQuestEvent.java b/main/src/main/java/me/blackvein/quests/events/quester/QuesterPreCompleteQuestEvent.java index a794d9af4..a830729a6 100644 --- a/main/src/main/java/me/blackvein/quests/events/quester/QuesterPreCompleteQuestEvent.java +++ b/main/src/main/java/me/blackvein/quests/events/quester/QuesterPreCompleteQuestEvent.java @@ -31,6 +31,11 @@ public class QuesterPreCompleteQuestEvent extends QuesterEvent implements Cancel this.quest = quest; } + public QuesterPreCompleteQuestEvent(final Quester quester, final Quest quest, final boolean async) { + super(quester, async); + this.quest = quest; + } + /** * Returns the quest involved in this event *