MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

pet debugging

Browse Source
This commit is contained in:
FatBoy-DOTC
2024-02-29 19:46:01 -06:00
parent 50fb0d39c5
commit 2b63ed08b8
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/gameManager/PowersManager.java
+21 -4
View File
@@ -330,7 +330,13 @@ public enum PowersManager {
if (pb.targetFromLastTarget() || pb.targetPet()) // use msg's target if (pb.targetFromLastTarget() || pb.targetPet()) // use msg's target
if (pb.isAOE()) { if (pb.isAOE()) {
if (!pb.usePointBlank()) { if (!pb.usePointBlank()) {
AbstractWorldObject target = getTarget(msg); AbstractWorldObject target;
if(msg.getTargetType() == 37 && Mob.dynamic_pets.get(msg.getTargetID()) != null){
Mob pet = Mob.dynamic_pets.get(msg.getTargetID());
target = pet;
}else{
target = getTarget(msg);
}
if (target != null && target.getObjectType() == GameObjectType.Building && !pb.targetBuilding()) { if (target != null && target.getObjectType() == GameObjectType.Building && !pb.targetBuilding()) {
PowersManager.sendPowerMsg(playerCharacter, 9, new PerformActionMsg(msg)); PowersManager.sendPowerMsg(playerCharacter, 9, new PerformActionMsg(msg));
@@ -356,7 +362,6 @@ public enum PowersManager {
}else{ }else{
target = getTarget(msg); target = getTarget(msg);
} }
ChatManager.chatSystemInfo(PlayerCharacter.getPlayerCharacter(msg.getSourceID()), "Target Acquired: " + target.getName());
if (target == null) { if (target == null) {
return true; return true;
} }
@@ -596,7 +601,13 @@ public enum PowersManager {
if (pb.targetFromLastTarget() || pb.targetPet()) // use msg's target if (pb.targetFromLastTarget() || pb.targetPet()) // use msg's target
if (pb.isAOE()) { if (pb.isAOE()) {
if (!pb.usePointBlank()) { if (!pb.usePointBlank()) {
AbstractWorldObject target = getTarget(msg); AbstractWorldObject target;
if(msg.getTargetType() == 37 && Mob.dynamic_pets.get(msg.getTargetID()) != null){
Mob pet = Mob.dynamic_pets.get(msg.getTargetID());
target = pet;
}else{
target = getTarget(msg);
}
if (target == null) { if (target == null) {
@@ -611,7 +622,13 @@ public enum PowersManager {
} }
} else { } else {
// get target // get target
AbstractWorldObject target = getTarget(msg); AbstractWorldObject target;
if(msg.getTargetType() == 37 && Mob.dynamic_pets.get(msg.getTargetID()) != null){
Mob pet = Mob.dynamic_pets.get(msg.getTargetID());
target = pet;
}else{
target = getTarget(msg);
}
if (target == null) if (target == null)
return true; return true;