Fix NBT write errors for parties

This commit is contained in:
Kam committed 2025-06-26 00:34:23 -04:00
1 parent a0775be65c
commit 8ebc372f83
1 file changed
+11 -4
@@ -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);