From b302f3fecb0427bea0d360b2d5eb6a17b9b2ac8f Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 4 Mar 2024 05:29:48 -0500 Subject: [PATCH] Validate the quest --- src/main/java/noppes/npcs/PacketHandlerServer.java | 10 ++++++---- src/main/java/noppes/npcs/controllers/data/Party.java | 6 +----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/main/java/noppes/npcs/PacketHandlerServer.java b/src/main/java/noppes/npcs/PacketHandlerServer.java index 4dc4c5742..f77467ad1 100644 --- a/src/main/java/noppes/npcs/PacketHandlerServer.java +++ b/src/main/java/noppes/npcs/PacketHandlerServer.java @@ -217,11 +217,13 @@ public class PacketHandlerServer{ Quest foundQuest = QuestController.Instance.quests.get(questID); if(foundQuest != null){ if (foundQuest.partyOptions.allowParty) { - if(playerData.questData.hasActiveQuest(questID)){ - QuestData questdata = new QuestData(foundQuest); - playerData.questData.activeQuests.put(questID, questdata); + if(party.validateQuest(questID)){ + if(playerData.questData.hasActiveQuest(questID)){ + QuestData questdata = new QuestData(foundQuest); + playerData.questData.activeQuests.put(questID, questdata); + } + party.setQuest(foundQuest); } - party.setQuest(foundQuest); } } } diff --git a/src/main/java/noppes/npcs/controllers/data/Party.java b/src/main/java/noppes/npcs/controllers/data/Party.java index 70fc5bae0..9a6c8a28f 100644 --- a/src/main/java/noppes/npcs/controllers/data/Party.java +++ b/src/main/java/noppes/npcs/controllers/data/Party.java @@ -212,7 +212,7 @@ public class Party { return this.partyMembers.keySet(); } - // To Be Called DURING Invite, Leave, Quest Switch, Leader Switch, etc. + // To Be Called during Set Quest or Quest Switch public boolean validateQuest(int questID) { IQuest quest = QuestController.Instance.get(questID); if (quest == null) { @@ -290,10 +290,6 @@ public class Party { sendInfoMessage(leader, String.format("%s was not found", playerName)); } } - - if(allowQuest){ - sendInfoMessage(leader, "\u00A7aQuest set to party!"); - } return allowQuest; }