upstream/CustomNPC-Plus
2
0 Fork 0
mirror of https://github.com/KAMKEEL/CustomNPC-Plus.git synced 2026-11-12 02:37:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implemented party locking disabling modifying a party in the party GUI and its packets on the server side.

Browse Source
This commit is contained in:
luisc committed 2024-02-13 18:02:50 -06:00
1 parent 943f80c7ac
commit 8c7f31f1e2
3 files changed
+48 -35
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/noppes/npcs/PacketHandlerServer.java
+17 -10
View File
@@ -135,12 +135,14 @@ public class PacketHandlerServer{
PlayerData playerData = PlayerDataController.Instance.getPlayerData(player);
if (playerData.partyUUID != null) {
Party party = PartyController.Instance().getParty(playerData.partyUUID);
party.removePlayer(kickPlayer);
if (kickPlayer != player) {
sendPartyData(player);
} else {
sendInviteData((EntityPlayerMP) kickPlayer);
}
if (!party.getIsLocked()) {
party.removePlayer(kickPlayer);
if (kickPlayer != player) {
sendPartyData(player);
} else {
sendInviteData((EntityPlayerMP) kickPlayer);
}
}
}
}
} else if (type == EnumPacketServer.SavePartyData) {
@@ -153,8 +155,10 @@ public class PacketHandlerServer{
PlayerData playerData = PlayerDataController.Instance.getPlayerData(player);
if (playerData.partyUUID != null) {
Party party = PartyController.Instance().getParty(playerData.partyUUID);
party.setLeader(NoppesUtilServer.getPlayerByName(Server.readString(buffer)));
Server.sendData(player, EnumPacketClient.GUI_DATA, party.writeToNBT());
if (!party.getIsLocked()) {
party.setLeader(NoppesUtilServer.getPlayerByName(Server.readString(buffer)));
Server.sendData(player, EnumPacketClient.GUI_DATA, party.writeToNBT());
}
}
} else if (type == EnumPacketServer.PartyInvite) {
EntityPlayer invitedPlayer = NoppesUtilServer.getPlayerByName(Server.readString(buffer));
@@ -162,7 +166,10 @@ public class PacketHandlerServer{
PlayerData senderData = PlayerDataController.Instance.getPlayerData(player);
PlayerData invitedData = PlayerDataController.Instance.getPlayerData(invitedPlayer);
if (senderData.partyUUID != null && invitedData.partyUUID == null) {//only send invite if player is not in a party
invitedData.inviteToParty(PartyController.Instance().getParty(senderData.partyUUID));
Party party = PartyController.Instance().getParty(senderData.partyUUID);
if (!party.getIsLocked()) {
invitedData.inviteToParty(party);
}
}
}
} else if (type == EnumPacketServer.GetPartyInviteList) {
@@ -1271,4 +1278,4 @@ public class PacketHandlerServer{
private void warn(EntityPlayer player, String warning){
MinecraftServer.getServer().logWarning(player.getCommandSenderName() + ": " + warning);
}
}
}