From a3c6ec02f55f79ac0da5862389f575ccd091b99e Mon Sep 17 00:00:00 2001 From: Kam Date: Wed, 6 Mar 2024 05:25:33 -0500 Subject: [PATCH] Fix Send Kick Messages --- .../java/noppes/npcs/PacketHandlerServer.java | 2 +- .../noppes/npcs/controllers/PartyController.java | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/main/java/noppes/npcs/PacketHandlerServer.java b/src/main/java/noppes/npcs/PacketHandlerServer.java index 847cbd1ad..f0bd5402b 100644 --- a/src/main/java/noppes/npcs/PacketHandlerServer.java +++ b/src/main/java/noppes/npcs/PacketHandlerServer.java @@ -160,7 +160,7 @@ public class PacketHandlerServer{ sendInviteData((EntityPlayerMP) kickPlayer); } PartyController.Instance().pingPartyUpdate(party); - PartyController.Instance().sendKickMessages(party, kickPlayerName); + PartyController.Instance().sendKickMessages(party, kickPlayer, kickPlayerName); } } } diff --git a/src/main/java/noppes/npcs/controllers/PartyController.java b/src/main/java/noppes/npcs/controllers/PartyController.java index 960dbdcb0..1fe38139f 100644 --- a/src/main/java/noppes/npcs/controllers/PartyController.java +++ b/src/main/java/noppes/npcs/controllers/PartyController.java @@ -78,19 +78,22 @@ public class PartyController { } } - public void sendKickMessages(Party party, String kickPlayer){ - if(kickPlayer == null || party == null) + public void sendKickMessages(Party party, EntityPlayer kickPlayer, String kickPlayerName){ + if(party == null) return; for(String name : party.getPlayerNames()){ EntityPlayer playerMP = NoppesUtilServer.getPlayerByName(name); if(playerMP != null){ - Server.sendData((EntityPlayerMP) playerMP, EnumPacketClient.PARTY_MESSAGE, "party.kickOtherAlert", kickPlayer); - Server.sendData((EntityPlayerMP) playerMP, EnumPacketClient.CHAT, "\u00A7e", kickPlayer, " \u00A74", "party.kickOtherChat", "!"); + Server.sendData((EntityPlayerMP) playerMP, EnumPacketClient.PARTY_MESSAGE, "party.kickOtherAlert", kickPlayerName); + Server.sendData((EntityPlayerMP) playerMP, EnumPacketClient.CHAT, "\u00A7e", kickPlayerName, " \u00A74", "party.kickOtherChat", "!"); } } - Server.sendData((EntityPlayerMP) kickPlayer, EnumPacketClient.PARTY_MESSAGE, "party.kickYouAlert", ""); - Server.sendData((EntityPlayerMP) kickPlayer, EnumPacketClient.CHAT, "\u00A74", "party.kickYouChat", "!"); + + if(kickPlayer != null){ + Server.sendData((EntityPlayerMP) kickPlayer, EnumPacketClient.PARTY_MESSAGE, "party.kickYouAlert", ""); + Server.sendData((EntityPlayerMP) kickPlayer, EnumPacketClient.CHAT, "\u00A74", "party.kickYouChat", "!"); + } } public void sendLeavingMessages(Party party, EntityPlayer leavingPlayer){