fix mob target aggro issue

This commit is contained in:
2025-02-15 12:27:53 -06:00
parent 56ce5b5a3c
commit 4e9b1927f2
+13 -13
View File
@@ -1103,17 +1103,17 @@ public class MobAI {
if (mob.getCombatTarget() == null) if (mob.getCombatTarget() == null)
CheckForPlayerGuardAggro(mob); CheckForPlayerGuardAggro(mob);
AbstractWorldObject newTarget = ChangeTargetFromHateValue(mob); // AbstractWorldObject newTarget = ChangeTargetFromHateValue(mob);
if (newTarget != null) { //if (newTarget != null) {
if (newTarget.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) { // if (newTarget.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) {
if (GuardCanAggro(mob, (PlayerCharacter) newTarget)) // if (GuardCanAggro(mob, (PlayerCharacter) newTarget))
mob.setCombatTarget(newTarget); // mob.setCombatTarget(newTarget);
} else // } else
mob.setCombatTarget(newTarget); // mob.setCombatTarget(newTarget);
} //}
CheckMobMovement(mob); CheckMobMovement(mob);
CheckForAttack(mob); CheckForAttack(mob);
} catch (Exception e) { } catch (Exception e) {
@@ -1205,17 +1205,17 @@ public class MobAI {
if (mob.BehaviourType.isAgressive) { if (mob.BehaviourType.isAgressive) {
AbstractWorldObject newTarget = ChangeTargetFromHateValue(mob); //AbstractWorldObject newTarget = ChangeTargetFromHateValue(mob);
if (newTarget != null) //if (newTarget != null)
mob.setCombatTarget(newTarget); //mob.setCombatTarget(newTarget);
else { //else {
if (mob.getCombatTarget() == null) { if (mob.getCombatTarget() == null) {
if (mob.BehaviourType == Enum.MobBehaviourType.HamletGuard) if (mob.BehaviourType == Enum.MobBehaviourType.HamletGuard)
SafeGuardAggro(mob); //safehold guard SafeGuardAggro(mob); //safehold guard
else else
CheckForAggro(mob); //normal aggro CheckForAggro(mob); //normal aggro
} // }
} }
} }