From 7e64cbabf82e181148796358dca9400d86f3f080 Mon Sep 17 00:00:00 2001 From: MagicBot Date: Sun, 27 Aug 2023 21:30:57 -0400 Subject: [PATCH] Update to slotting logic. --- src/engine/gameManager/NPCManager.java | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/engine/gameManager/NPCManager.java b/src/engine/gameManager/NPCManager.java index e16533b0..b4362249 100644 --- a/src/engine/gameManager/NPCManager.java +++ b/src/engine/gameManager/NPCManager.java @@ -345,17 +345,7 @@ public enum NPCManager { // 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) || - mobile.behaviourType.equals(Enum.MobBehaviourType.GuardCaptain)) - 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.