From 8ebc372f83e85aca06db14488e18cc329710a7db Mon Sep 17 00:00:00 2001 From: Kam Date: Thu, 26 Jun 2025 00:34:23 -0400 Subject: [PATCH] Fix NBT write errors for parties --- .../java/noppes/npcs/controllers/data/Party.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/noppes/npcs/controllers/data/Party.java b/src/main/java/noppes/npcs/controllers/data/Party.java index 7a89e06c7..66988a104 100644 --- a/src/main/java/noppes/npcs/controllers/data/Party.java +++ b/src/main/java/noppes/npcs/controllers/data/Party.java @@ -217,7 +217,11 @@ public class Party implements IParty { if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) { return this.partyLeaderName; } else { - return this.getPartyLeader().getCommandSenderName(); + EntityPlayer leader = this.getPartyLeader(); + if (leader != null) + return leader.getCommandSenderName(); + String name = this.partyMembers.get(this.partyLeader); + return name == null ? "" : name; } } @@ -426,12 +430,14 @@ public class Party implements IParty { for (UUID uuid : this.partyOrder) { NBTTagCompound uuidCompound = new NBTTagCompound(); uuidCompound.setString("UUID", uuid.toString()); - uuidCompound.setString("PlayerName", this.partyMembers.get(uuid)); + String name = this.partyMembers.get(uuid); + uuidCompound.setString("PlayerName", name == null ? "" : name); list.appendTag(uuidCompound); } compound.setTag("PartyMembers", list); - compound.setString("PartyLeader", getPartyLeader().getCommandSenderName()); + EntityPlayer leader = getPartyLeader(); + compound.setString("PartyLeader", leader != null ? leader.getCommandSenderName() : ""); Quest quest = (Quest) QuestController.Instance.get(this.getCurrentQuestID()); if (quest != null) { compound.setString("QuestName", quest.getName()); @@ -480,7 +486,8 @@ public class Party implements IParty { for (UUID uuid : this.partyOrder) { NBTTagCompound uuidCompound = new NBTTagCompound(); uuidCompound.setString("UUID", uuid.toString()); - uuidCompound.setString("PlayerName", this.partyMembers.get(uuid)); + String name = this.partyMembers.get(uuid); + uuidCompound.setString("PlayerName", name == null ? "" : name); list.appendTag(uuidCompound); } compound.setTag("PartyMembers", list);