From 047ea6eb155adfdf4ea7fcd65d8ce3bbc69c3ce6 Mon Sep 17 00:00:00 2001 From: Kam Date: Tue, 5 Mar 2024 14:39:13 -0500 Subject: [PATCH] On set Party Quest send a message to party --- .../java/noppes/npcs/PacketHandlerServer.java | 1 + .../npcs/controllers/PartyController.java | 17 ++++++++++++----- .../resources/assets/customnpcs/lang/en_US.lang | 1 + 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/main/java/noppes/npcs/PacketHandlerServer.java b/src/main/java/noppes/npcs/PacketHandlerServer.java index f77467ad1..7cf97c1e3 100644 --- a/src/main/java/noppes/npcs/PacketHandlerServer.java +++ b/src/main/java/noppes/npcs/PacketHandlerServer.java @@ -223,6 +223,7 @@ public class PacketHandlerServer{ playerData.questData.activeQuests.put(questID, questdata); } party.setQuest(foundQuest); + PartyController.Instance().sendQuestChat(party, "party.setChat", " ", foundQuest.title); } } } diff --git a/src/main/java/noppes/npcs/controllers/PartyController.java b/src/main/java/noppes/npcs/controllers/PartyController.java index f61e55f6b..ff4c3ee11 100644 --- a/src/main/java/noppes/npcs/controllers/PartyController.java +++ b/src/main/java/noppes/npcs/controllers/PartyController.java @@ -131,14 +131,21 @@ public class PartyController { } } - public void sendQuestChat(Party party, String chatAlert){ - if(party == null) + public void sendQuestChat(Party party, String... chatAlerts) { + if (party == null) return; - for(String name : party.getPlayerNames()){ + for (String name : party.getPlayerNames()) { EntityPlayer playerMP = NoppesUtilServer.getPlayerByName(name); - if(playerMP != null){ - Server.sendData((EntityPlayerMP) playerMP, EnumPacketClient.CHAT, "\u00A7a", chatAlert, "!"); + if (playerMP != null) { + Object[] args = new Object[2 + chatAlerts.length]; + args[0] = "\u00A7a"; + + System.arraycopy(chatAlerts, 0, args, 1, chatAlerts.length); + args[args.length - 1] = "!"; // Add "!" at the end + + // Pass args to Server.sendData using spread operator + Server.sendData((EntityPlayerMP) playerMP, EnumPacketClient.CHAT, args); } } } diff --git a/src/main/resources/assets/customnpcs/lang/en_US.lang b/src/main/resources/assets/customnpcs/lang/en_US.lang index 5e988d375..7142b0fe2 100644 --- a/src/main/resources/assets/customnpcs/lang/en_US.lang +++ b/src/main/resources/assets/customnpcs/lang/en_US.lang @@ -142,6 +142,7 @@ party.dropQuest=Drop Quest party.friendlyFire=Friendly Fire party.ignore=Ignore party.invite=Invite +party.setChat=Party quest set to party.completeChat=The party quest has been completed! party.kick=Kick