Preston/prestonbane
1
0
Fork 0
forked from MagicBane/Server
Code Issues Pull Requests Projects Releases Wiki Activity

infinite loop fix

Browse Source
This commit is contained in:
FatBoy-DOTC
2023-08-08 13:36:46 -05:00
parent e88e8b56c6
commit 923447e983
4 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/gameManager/NPCManager.java
+1 -1
View File
@@ -108,7 +108,7 @@ public enum NPCManager {
public static void dismissNecroPet(Mob necroPet, boolean updateOwner) {
necroPet.combatTarget = null;
necroPet.setCombatTarget(null);
necroPet.hasLoot = false;
if (necroPet.parentZone != null)
src/engine/mobileAI/MobAI.java
+14 -10
View File
@@ -234,7 +234,7 @@ public class MobAI {
attackDelay = 11000;
CombatUtilities.combatCycle(mob, target, false, mob.getWeaponItemBase(false));
mob.setLastAttackTime(System.currentTimeMillis() + attackDelay);
if (target.combatTarget == null) {
if (target.getCombatTarget() == null) {
target.setCombatTarget(mob);
}
}
@@ -638,14 +638,15 @@ public class MobAI {
//no players loaded, no need to proceed
if (mob.playerAgroMap.isEmpty() && mob.isPlayerGuard == false && mob.BehaviourType.ordinal() != Enum.MobBehaviourType.Pet1.ordinal()) {
mob.setCombatTarget(null);
if (mob.playerAgroMap.isEmpty()) {
if(mob.getCombatTarget() != null)
mob.setCombatTarget(null);
return;
}
if (mob.BehaviourType.ordinal() != Enum.MobBehaviourType.Pet1.ordinal())
CheckToSendMobHome(mob);
if (mob.combatTarget != null) {
if (mob.getCombatTarget() != null) {
if (mob.getCombatTarget().isAlive() == false) {
mob.setCombatTarget(null);
return;
@@ -653,7 +654,7 @@ public class MobAI {
if (mob.getCombatTarget().getObjectTypeMask() == MBServerStatics.MASK_PLAYER) {
PlayerCharacter target = (PlayerCharacter) mob.combatTarget;
PlayerCharacter target = (PlayerCharacter) mob.getCombatTarget();
if (mob.playerAgroMap.containsKey(target.getObjectUUID()) == false) {
mob.setCombatTarget(null);
@@ -745,7 +746,7 @@ public class MobAI {
}
if (aiAgent.combatTarget == null) {
if (aiAgent.getCombatTarget() == null) {
//look for pets to aggro if no players found to aggro
@@ -1046,9 +1047,12 @@ public class MobAI {
}
}else {
if (mob.npcOwner.getCombatTarget() != null)
if(mob.getCombatTarget() != null && mob.getCombatTarget().equals(mob.npcOwner.getCombatTarget()) == false)
mob.setCombatTarget(mob.npcOwner.getCombatTarget());
else
mob.setCombatTarget(null);
if(mob.getCombatTarget() != null) {
mob.setCombatTarget(null);
}
}
CheckMobMovement(mob);
CheckForAttack(mob);
@@ -1110,7 +1114,7 @@ public class MobAI {
if (mob.getCombatTarget() == null)
SafeGuardAggro(mob);
else if (mob.combatTarget.isAlive() == false)
else if (mob.getCombatTarget().isAlive() == false)
SafeGuardAggro(mob);
CheckForAttack(mob);
@@ -1151,7 +1155,7 @@ public class MobAI {
//check if mob can attack if it isn't wimpy
if (!mob.BehaviourType.isWimpy && mob.combatTarget != null)
if (!mob.BehaviourType.isWimpy && mob.getCombatTarget() != null)
CheckForAttack(mob);
} catch (Exception e) {
@@ -1199,7 +1203,7 @@ public class MobAI {
if (GuardCanAggro(mob, loadedPlayer) == false)
continue;
if (MovementUtilities.inRangeToAggro(mob, loadedPlayer)) {
if (MovementUtilities.inRangeToAggro(mob, loadedPlayer) && mob.getCombatTarget() == null) {
mob.setCombatTarget(loadedPlayer);
return;
}
src/engine/objects/AbstractCharacter.java
+8 -8
View File
@@ -1162,20 +1162,20 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
}
public final void setCombatTarget(final AbstractWorldObject value) {
if(value.getObjectTypeMask() == MBServerStatics.MASK_MOB) {
if(this.getObjectTypeMask() == 2050) {//MOB?
if (value == null) {
if (this.isCombat()) {
this.setCombat(false);
UpdateStateMsg rwss = new UpdateStateMsg();
rwss.setPlayer(this);
DispatchMessage.sendToAllInRange(this, rwss);
} else {
if (!this.isCombat()) {
this.setCombat(true);
UpdateStateMsg rwss = new UpdateStateMsg();
rwss.setPlayer(this);
DispatchMessage.sendToAllInRange(this, rwss);
}
}
}else {
if (!this.isCombat()) {
this.setCombat(true);
UpdateStateMsg rwss = new UpdateStateMsg();
rwss.setPlayer(this);
DispatchMessage.sendToAllInRange(this, rwss);
}
}
}
src/engine/objects/Mob.java
+5 -5
View File
@@ -1305,7 +1305,7 @@ public class Mob extends AbstractIntelligenceAgent {
} catch (Exception e) {
Logger.error(e.getMessage());
}
this.combatTarget = null;
this.setCombatTarget(null);
this.hasLoot = false;
this.playerAgroMap.clear();
@@ -1329,7 +1329,7 @@ public class Mob extends AbstractIntelligenceAgent {
} else if (this.isPet() || this.isNecroPet()) {
//this.state = STATE.Disabled;
this.combatTarget = null;
this.setCombatTarget(null);
this.hasLoot = false;
//if (this.parentZone != null)
@@ -1372,7 +1372,7 @@ public class Mob extends AbstractIntelligenceAgent {
this.combat = false;
this.walkMode = true;
this.combatTarget = null;
this.setCombatTarget(null);
this.hasLoot = this.charItemManager.getInventoryCount() > 0;
} catch (Exception e) {
@@ -1391,7 +1391,7 @@ public class Mob extends AbstractIntelligenceAgent {
this.mana.set(this.manaMax);
this.combat = false;
this.walkMode = true;
this.combatTarget = null;
this.setCombatTarget(null);
this.isAlive.set(true);
this.deathTime = 0;
this.lastBindLoc = this.bindLoc;
@@ -2079,7 +2079,7 @@ public class Mob extends AbstractIntelligenceAgent {
PlayerCharacter player = (PlayerCharacter) ac;
if (this.getCombatTarget() == null) {
this.combatTarget = ac;
this.setCombatTarget(ac);
return;
}