Better handling of null guilds.

2024-01-28 10:15:55 -05:00
parent 165752f6d6
commit f845c0ad80
1 changed files with 6 additions and 2 deletions
@@ -461,6 +461,8 @@ public class NPC extends AbstractCharacter {

        NPC newNPC = new NPC();

+        newNPC.parentZoneUUID = parent.getObjectUUID();
+
        newNPC.name = name;
        newNPC.contractUUID = contractID;

@@ -469,8 +471,10 @@ public class NPC extends AbstractCharacter {
        else
            newNPC.bindLoc = Vector3fImmutable.ZERO;

-        newNPC.parentZoneUUID = parent.getObjectUUID();
-        newNPC.guildUUID = guild.getObjectUUID();
+        if (guild == null)
+            newNPC.guildUUID = 0;
+        else
+            newNPC.guildUUID = guild.getObjectUUID();

        if (building == null)
            newNPC.buildingUUID = 0;