diff --git a/main/src/main/java/me/blackvein/quests/Quester.java b/main/src/main/java/me/blackvein/quests/Quester.java index d2fd2eb6e..de59efe73 100644 --- a/main/src/main/java/me/blackvein/quests/Quester.java +++ b/main/src/main/java/me/blackvein/quests/Quester.java @@ -3282,9 +3282,12 @@ public class Quester { List mq = getMultiplayerQuesters(quest); for (Quester q : mq) { if (q.containsObjective(quest, objectiveType)) { - fun.apply(q); + if (quest.getOptions().getRequireSameQuest() && this.containsObjective(quest, objectiveType)) { + fun.apply(q); + } else if (!quest.getOptions().getRequireSameQuest()) { + fun.apply(q); + } } - } } } 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 3147abe55..31ba57792 100644 --- a/main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java +++ b/main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java @@ -729,18 +729,14 @@ public class PlayerListener implements Listener { Quester quester = plugin.getQuester(damager.getUniqueId()); LinkedList allQuests = plugin.getQuests(); for (Quest quest : allQuests) { - boolean multiplayer = !quest.getOptions().getRequireSameQuest(); if (quester.getCurrentQuests().containsKey(quest) && quester.containsObjective(quest, "killMob")) { quester.killMob(quest, target.getLocation(), target.getType()); - multiplayer = true; } - if (multiplayer) { - quester.dispatchMultiplayerEverything(quest, "killMob", (Quester q) -> { - q.killMob(quest, target.getLocation(), target.getType()); - return null; - }); - } + quester.dispatchMultiplayerEverything(quest, "killMob", (Quester q) -> { + q.killMob(quest, target.getLocation(), target.getType()); + return null; + }); } } }