From e45412ad25429606e05441fe68372bde13ce0e05 Mon Sep 17 00:00:00 2001
From: PikaMug <unconfigured@null.spigotmc.org>
Date: Sat, 14 Sep 2019 01:33:09 -0400
Subject: [PATCH] Attempt to support both types of progress sharing

---
 .../me/blackvein/quests/listeners/PlayerListener.java    | 9 +++++----
 1 file changed, 5 insertions(+), 4 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 1eb98948e..48704e822 100644
--- a/main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java
+++ b/main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java
@@ -727,11 +727,12 @@ public class PlayerListener implements Listener {
 				}
 			}
 			Quester quester = plugin.getQuester(damager.getUniqueId());
-			for (Quest quest : quester.getCurrentQuests().keySet()) {
-				if (quester.containsObjective(quest, "killMob")) {
+			LinkedList<Quest> allQuests = plugin.getQuests();
+			for (Quest quest : allQuests) {
+				if ((quester.getCurrentQuests().containsKey(quest) && quester.containsObjective(quest, "killMob"))
+						|| !quest.getOptions().getRequireSameQuest()) {
 					quester.killMob(quest, target.getLocation(), target.getType());
-					
-					// Multiplayer
+						
 					quester.dispatchMultiplayerEverything(quest, "killMob", (Quester q) -> {
 						q.killMob(quest, target.getLocation(), target.getType());
 						return null;