Iterate quests of fellow questers for edge case, per #1570

PikaMug · Jan 18, 2021 · dcb0d8f · dcb0d8f
1 parent 81bddd2
commit dcb0d8f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/main/src/main/java/me/blackvein/quests/Quester.java b/main/src/main/java/me/blackvein/quests/Quester.java
@@ -4042,14 +4042,15 @@ public Set<String> dispatchMultiplayerEverything(final Quest quest, final Object
                                 fun.apply(q, quest);
                                 appliedQuestIDs.add(quest.getId());
                             }
-                        } else {
-                            q.getCurrentQuests().forEach((otherQuest, i) -> {
-                                if (otherQuest.getStage(i).containsObjective(type)) {
+                        }
+                        q.getCurrentQuests().forEach((otherQuest, i) -> {
+                            if (otherQuest.getStage(i).containsObjective(type)) {
+                                if (!otherQuest.getOptions().canShareSameQuestOnly()) {
                                     fun.apply(q, otherQuest);
                                     appliedQuestIDs.add(otherQuest.getId());
                                 }
-                            });
-                        }
+                            }
+                        });
                     }
                 }
             } catch (final Exception e) {

diff --git a/main/src/main/java/me/blackvein/quests/listeners/BlockListener.java b/main/src/main/java/me/blackvein/quests/listeners/BlockListener.java
@@ -76,13 +76,13 @@ public void onBlockBreak(final BlockBreakEvent evt) {
                             quester.breakBlock(quest, blockItemStack);
 
                             // Multiplayer
-                            if (!dispatchedQuestIDs.contains(quest.getId())) {
-                                dispatchedQuestIDs.addAll(quester.dispatchMultiplayerEverything(quest, breakType,
-                                        (final Quester q, final Quest cq) -> {
-                                    q.breakBlock(cq, blockItemStack);
-                                    return null;
-                                }));
-                            }
+                            dispatchedQuestIDs.addAll(quester.dispatchMultiplayerEverything(quest, breakType,
+                                    (final Quester q, final Quest cq) -> {
+                                if (!dispatchedQuestIDs.contains(cq.getId())) {
+                                    q.breakBlock(cq, blockItemStack);      
+                                }
+                                return null;
+                            }));
                         }
                     }