From 85c2a4f4f0471d933e1800be026918b7850aaf90 Mon Sep 17 00:00:00 2001 From: MagicBot Date: Sun, 27 Aug 2023 21:20:00 -0400 Subject: [PATCH] Add all as hirelings --- src/engine/gameManager/NPCManager.java | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/engine/gameManager/NPCManager.java b/src/engine/gameManager/NPCManager.java index cc9c70dc..4a0d7511 100644 --- a/src/engine/gameManager/NPCManager.java +++ b/src/engine/gameManager/NPCManager.java @@ -343,18 +343,7 @@ public enum NPCManager { if (buildingSlot == -1) Logger.error("No available slot for NPC: " + abstractCharacter.getObjectUUID()); - // Pets are regular mobiles not hirelings (Siege engines) - - if (!abstractCharacter.getObjectType().equals(Enum.GameObjectType.Mob)) - abstractCharacter.building.getHirelings().put(abstractCharacter, buildingSlot); - else { - Mob mobile = (Mob) abstractCharacter; - - // Siege engines are not hirelings but minions of said hireling. - - if (!mobile.behaviourType.equals(Enum.MobBehaviourType.SiegeEngine)) - abstractCharacter.building.getHirelings().put(abstractCharacter, buildingSlot); - } + abstractCharacter.building.getHirelings().put(abstractCharacter, buildingSlot); // Override bind and location for this npc derived // from BuildingManager slot location data.