Browse Source

Add all as hirelings

combat-2
MagicBot 1 year ago
parent
commit
85c2a4f4f0
  1. 13
      src/engine/gameManager/NPCManager.java

13
src/engine/gameManager/NPCManager.java

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

Loading…
Cancel
Save