forked from MagicBane/Server
pet debugging
This commit is contained in:
@@ -350,9 +350,12 @@ public enum PowersManager {
|
||||
} else {
|
||||
// get target
|
||||
AbstractWorldObject target = getTarget(msg);
|
||||
if(target == null && msg.getTargetType() == 37 && Mob.dynamic_pets.get(msg.getTargetID()) != null){
|
||||
Mob pet = Mob.dynamic_pets.get(msg.getTargetID());
|
||||
target = pet;
|
||||
}
|
||||
|
||||
if (target == null) {
|
||||
ChatManager.chatSystemInfo(PlayerCharacter.getPlayerCharacter(msg.getSourceID()), "Target Null");
|
||||
return true;
|
||||
}
|
||||
if (!target.isAlive() && target.getObjectType().equals(GameObjectType.Building) == false && msg.getPowerUsedID() != 428589216)
|
||||
|
||||
@@ -42,6 +42,8 @@ import static engine.net.client.msg.ErrorPopupMsg.sendErrorPopup;
|
||||
public class Mob extends AbstractIntelligenceAgent {
|
||||
|
||||
private static int staticID = 0;
|
||||
|
||||
public static HashMap<Integer,Mob> dynamic_pets = new HashMap<>();
|
||||
//mob specific
|
||||
public final ConcurrentHashMap<Integer, Float> playerAgroMap = new ConcurrentHashMap<>(); //key = Player value = hate value
|
||||
|
||||
@@ -561,7 +563,8 @@ public class Mob extends AbstractIntelligenceAgent {
|
||||
|
||||
petMinion.despawned = false;
|
||||
petMinion.runAfterLoad();
|
||||
DbManager.addToCache(petMinion);
|
||||
//DbManager.addToCache(petMinion);
|
||||
Mob.dynamic_pets.put(petMinion.getObjectUUID(),petMinion);
|
||||
petMinion.setLoc(petMinion.bindLoc);
|
||||
|
||||
return petMinion;
|
||||
@@ -933,7 +936,9 @@ public class Mob extends AbstractIntelligenceAgent {
|
||||
this.playerAgroMap.clear();
|
||||
WorldGrid.RemoveWorldObject(this);
|
||||
|
||||
DbManager.removeFromCache(this);
|
||||
//DbManager.removeFromCache(this);
|
||||
if(Mob.dynamic_pets.containsKey(this.getObjectUUID()))
|
||||
Mob.dynamic_pets.remove(this.getObjectUUID());
|
||||
PlayerCharacter petOwner = (PlayerCharacter) this.guardCaptain;
|
||||
|
||||
if (petOwner != null) {
|
||||
|
||||
Reference in New Issue
Block a user