Browse Source

Affirmatively check hireling entry instead of relying upon loadID =0 which was a side effect.

master
MagicBot 2 years ago
parent
commit
a01a342fd8
  1. 3
      src/engine/objects/Mob.java
  2. 7
      src/engine/objects/NPC.java

3
src/engine/objects/Mob.java

@ -807,7 +807,8 @@ public class Mob extends AbstractIntelligenceAgent {
// only if this building has a blueprint. // only if this building has a blueprint.
// otherwise use the mob cache location. // otherwise use the mob cache location.
if (this.building != null && building.getBlueprintUUID() != 0) { if (this.building != null && building.getBlueprintUUID() != 0
&& this.building.getHirelings().contains(this) == false) {
int maxSlots = 10; int maxSlots = 10;

7
src/engine/objects/NPC.java

@ -352,9 +352,12 @@ public class NPC extends AbstractCharacter {
this.stamina.set(this.staminaMax); this.stamina.set(this.staminaMax);
} }
//add this npc to building // Add this npc to building hireling list if not there yet.
// For some reason the mob is initialized twice when
// createMobWithNoID() is called.
if (this.building != null) { if (this.building != null &&
this.building.getHirelings().contains(this) == false) {
int maxSlots = 10; int maxSlots = 10;

Loading…
Cancel
Save