Merge remote-tracking branch 'origin/bugfix-safeguard-aggro' into magicbox-1.5.2

2024-01-29 12:31:26 -05:00
parent c0ee8b82f8 fcd37cbae2
commit 250e3407fa
5 changed files with 37 additions and 39 deletions
@@ -545,7 +545,7 @@ public enum BuildingManager {

        NPC npc = null;

-        npc = NPC.createNPC(pirateName, NpcID.getObjectUUID(), NpcLoc, null, zone, (short) rank, building);
+        npc = NPC.createNPC(pirateName, NpcID.getObjectUUID(), NpcLoc, building.getGuild(), zone, (short) rank, building);

        if (npc == null)
            return false;