Browse Source

Update to slotting logic.

combat-2
MagicBot 1 year ago
parent
commit
14a06410ae
  1. 14
      src/engine/gameManager/NPCManager.java

14
src/engine/gameManager/NPCManager.java

@ -343,7 +343,19 @@ public enum NPCManager { @@ -343,7 +343,19 @@ public enum NPCManager {
if (buildingSlot == -1)
Logger.error("No available slot for NPC: " + abstractCharacter.getObjectUUID());
abstractCharacter.building.getHirelings().put(abstractCharacter, buildingSlot);
// 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);
}
// Override bind and location for this npc derived
// from BuildingManager slot location data.

Loading…
Cancel
Save