From 198ad10f2763290e84849838900a4c55130a2a38 Mon Sep 17 00:00:00 2001 From: Kam Date: Tue, 19 Mar 2024 13:55:56 -0400 Subject: [PATCH] Fix (Done) Message for Quest Kill and Quest Manual for Objective ALL type in parties --- src/main/java/noppes/npcs/quests/QuestKill.java | 9 ++++++--- src/main/java/noppes/npcs/quests/QuestManual.java | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/main/java/noppes/npcs/quests/QuestKill.java b/src/main/java/noppes/npcs/quests/QuestKill.java index 1f6f4e3d4..69f608388 100644 --- a/src/main/java/noppes/npcs/quests/QuestKill.java +++ b/src/main/java/noppes/npcs/quests/QuestKill.java @@ -277,14 +277,17 @@ public class QuestKill extends QuestInterface implements IQuestKill { QuestData questdata = party.getQuestData(); if (questdata != null) { if (questdata.quest.partyOptions.objectiveRequirement == EnumPartyObjectives.All) { - int progress = 0; + int howManyDone = 0; for (String player : party.getPlayerNames()) { HashMap killed = this.parent.getPlayerKilled(questdata, player); int currentProgress = !killed.containsKey(this.entity) ? 0 : (Integer) killed.get(this.entity); if(currentProgress >= this.amount) - progress += 1; + howManyDone += 1; } - return progress; + if(howManyDone == party.getPlayerNames().size()) + return getMaxProgress(); + + return 0; } else { HashMap killed = this.parent.getKilled(questdata); return !killed.containsKey(this.entity) ? 0 : (Integer) killed.get(this.entity); diff --git a/src/main/java/noppes/npcs/quests/QuestManual.java b/src/main/java/noppes/npcs/quests/QuestManual.java index b4e680806..9beb70a66 100644 --- a/src/main/java/noppes/npcs/quests/QuestManual.java +++ b/src/main/java/noppes/npcs/quests/QuestManual.java @@ -229,14 +229,17 @@ public class QuestManual extends QuestInterface{ QuestData questdata = party.getQuestData(); if (questdata != null) { if (questdata.quest.partyOptions.objectiveRequirement == EnumPartyObjectives.All) { - int progress = 0; + int howManyDone = 0; for (String player : party.getPlayerNames()) { HashMap playerManual = getPlayerManual(questdata, player); int currentProgress = !playerManual.containsKey(this.entity) ? 0 : (Integer) playerManual.get(this.entity); if(currentProgress >= this.amount) - progress += 1; + howManyDone += 1; } - return progress; + if(howManyDone == party.getPlayerNames().size()) + return getMaxProgress(); + + return 0; } else { HashMap playerManual = getManual(questdata); return !playerManual.containsKey(this.entity) ? 0 : (Integer) playerManual.get(this.entity);