From 3b2354efe08bdcbc0eaab2c263e76ef1b0001089 Mon Sep 17 00:00:00 2001 From: Kam Date: Fri, 1 Mar 2024 16:14:28 -0500 Subject: [PATCH] Kick Party Messages --- src/main/java/noppes/npcs/PacketHandlerServer.java | 14 ++++++++++++-- .../resources/assets/customnpcs/lang/en_US.lang | 4 ++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main/java/noppes/npcs/PacketHandlerServer.java b/src/main/java/noppes/npcs/PacketHandlerServer.java index 5df65423f..58789ce70 100644 --- a/src/main/java/noppes/npcs/PacketHandlerServer.java +++ b/src/main/java/noppes/npcs/PacketHandlerServer.java @@ -135,9 +135,20 @@ public class PacketHandlerServer{ if (playerData.partyUUID != null) { Party party = PartyController.Instance().getParty(playerData.partyUUID); if (!party.getIsLocked()) { - party.removePlayer(kickPlayer); + boolean successful = party.removePlayer(kickPlayer); if (kickPlayer != player) { sendPartyData(player); + if(successful){ + for(String name : party.getPlayerNames()){ + EntityPlayer playerMP = NoppesUtilServer.getPlayerByName(name); + if(playerMP != null){ + Server.sendData((EntityPlayerMP) playerMP, EnumPacketClient.PARTY_MESSAGE, "party.kickOtherAlert", kickPlayer.getCommandSenderName()); + Server.sendData((EntityPlayerMP) playerMP, EnumPacketClient.CHAT, "\u00A7c", kickPlayer.getCommandSenderName(), " \u00A7e", "party.kickOtherChat", "!"); + } + } + Server.sendData((EntityPlayerMP) kickPlayer, EnumPacketClient.PARTY_MESSAGE, "party.kickYouAlert", ""); + Server.sendData((EntityPlayerMP) kickPlayer, EnumPacketClient.CHAT, "\u00A7c", "party.kickYouChat", "!"); + } } else { sendInviteData((EntityPlayerMP) kickPlayer); } @@ -257,7 +268,6 @@ public class PacketHandlerServer{ public static void sendPartyData(EntityPlayerMP player) { PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); - if (playerData.partyUUID != null) { Party party = PartyController.Instance().getParty(playerData.partyUUID); NBTTagCompound compound = party.writeToNBT(); diff --git a/src/main/resources/assets/customnpcs/lang/en_US.lang b/src/main/resources/assets/customnpcs/lang/en_US.lang index 333c9b9ca..22169069e 100644 --- a/src/main/resources/assets/customnpcs/lang/en_US.lang +++ b/src/main/resources/assets/customnpcs/lang/en_US.lang @@ -145,6 +145,10 @@ party.ignore=Ignore party.invite=Invite party.inviteAlert=Invited to Party party.inviteChat=You've been invited to a party by +party.kickYouChat=You've been kicked from the party +party.kickYouAlert=Kicked from Party +party.kickOtherChat=has been kicked from the party +party.kickOtherAlert=Kicked Player party.kick=Kick party.kickConfirm=Are you sure you want to kick this player? party.leader=Leader