Browse Source

Powers also loaded from contract.

master
MagicBot 1 year ago
parent
commit
071eb26e48
  1. 11
      src/engine/objects/Mob.java

11
src/engine/objects/Mob.java

@ -60,7 +60,7 @@ public class Mob extends AbstractIntelligenceAgent {
public boolean despawned = false; public boolean despawned = false;
public Vector3fImmutable destination = Vector3fImmutable.ZERO; public Vector3fImmutable destination = Vector3fImmutable.ZERO;
public Vector3fImmutable localLoc = Vector3fImmutable.ZERO; public Vector3fImmutable localLoc = Vector3fImmutable.ZERO;
public HashMap<Integer, Integer> mobPowers; public HashMap<Integer, Integer> mobPowers = new HashMap<>();
public MobBase mobBase; public MobBase mobBase;
public int spawnTime; public int spawnTime;
public Zone parentZone; public Zone parentZone;
@ -1947,8 +1947,15 @@ public class Mob extends AbstractIntelligenceAgent {
} }
mobPowers = new HashMap<>(); mobPowers = new HashMap<>();
// Powers from mobbase
if (PowersManager.AllMobPowers.containsKey(this.getMobBaseID())) if (PowersManager.AllMobPowers.containsKey(this.getMobBaseID()))
mobPowers = PowersManager.AllMobPowers.get(this.getMobBaseID()); mobPowers.putAll(PowersManager.AllMobPowers.get(this.getMobBaseID()));
// Powers from contract
if (PowersManager.AllMobPowers.containsKey(this.contract.getContractID()))
mobPowers.putAll(PowersManager.AllMobPowers.get(this.contract.getContractID()));
if (this.equip == null) { if (this.equip == null) {
Logger.error("Null equipset returned for uuid " + currentID); Logger.error("Null equipset returned for uuid " + currentID);

Loading…
Cancel
Save