diff --git a/src/main/java/noppes/npcs/NoppesUtilPlayer.java b/src/main/java/noppes/npcs/NoppesUtilPlayer.java index 59513481f..b81701dfd 100644 --- a/src/main/java/noppes/npcs/NoppesUtilPlayer.java +++ b/src/main/java/noppes/npcs/NoppesUtilPlayer.java @@ -472,6 +472,9 @@ public class NoppesUtilPlayer { if (data.quest.completion == EnumQuestCompletion.Instant) EventHooks.onPartyFinished(party, data.quest); + if(data.quest.completion == EnumQuestCompletion.Npc) + PartyController.Instance().sendQuestChat(party, "party.completeChat"); + PartyEvent.PartyQuestTurnedInEvent partyEv = new PartyEvent.PartyQuestTurnedInEvent(party, data.quest); EventHooks.onPartyTurnIn(partyEv); if (partyEv.isCancelled()) diff --git a/src/main/java/noppes/npcs/controllers/PartyController.java b/src/main/java/noppes/npcs/controllers/PartyController.java index a890e53b0..93b9c036f 100644 --- a/src/main/java/noppes/npcs/controllers/PartyController.java +++ b/src/main/java/noppes/npcs/controllers/PartyController.java @@ -199,10 +199,12 @@ public class PartyController { questData.isCompleted = true; if (questData.quest.completion == EnumQuestCompletion.Npc) { EventHooks.onPartyFinished(party, questData.quest); + PartyController.Instance().sendQuestChat(party, "party.turnedInChat"); + } else { + party.setQuest(null); + PartyController.Instance().sendQuestChat(party, "party.completeChat"); } - party.setQuest(null); PartyController.Instance().pingPartyUpdate(party); - PartyController.Instance().sendQuestChat(party, "party.completeChat"); } } else { questData.isCompleted = false; diff --git a/src/main/resources/assets/customnpcs/lang/en_US.lang b/src/main/resources/assets/customnpcs/lang/en_US.lang index 7142b0fe2..4d371a1e8 100644 --- a/src/main/resources/assets/customnpcs/lang/en_US.lang +++ b/src/main/resources/assets/customnpcs/lang/en_US.lang @@ -144,6 +144,7 @@ party.ignore=Ignore party.invite=Invite party.setChat=Party quest set to party.completeChat=The party quest has been completed! +party.turnedInChat=The party quest is ready to be turned in! party.kick=Kick party.kickConfirm=Are you sure you want to kick this player?