From 1bb99127c40cd8067e69beb9abe37f0a2b76294f Mon Sep 17 00:00:00 2001
From: FatBoy-DOTC <justin.chucksinsulating@gmail.com>
Date: Mon, 13 Jan 2025 15:58:44 -0600
Subject: [PATCH] mob drop aggro check
---
src/engine/mobileAI/MobAI.java | 6 ++----
src/engine/mobileAI/utilities/MovementUtilities.java | 2 +-
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/engine/mobileAI/MobAI.java b/src/engine/mobileAI/MobAI.java
index 541333db..95c7fe5f 100644
--- a/src/engine/mobileAI/MobAI.java
+++ b/src/engine/mobileAI/MobAI.java
@@ -9,7 +9,6 @@
package engine.mobileAI;
import engine.Enum;
-import engine.Enum.DispatchChannel;
import engine.InterestManagement.WorldGrid;
import engine.gameManager.*;
import engine.math.Vector3f;
@@ -19,7 +18,6 @@ import engine.mobileAI.utilities.CombatUtilities;
import engine.mobileAI.utilities.MovementUtilities;
import engine.net.DispatchMessage;
import engine.net.client.msg.PerformActionMsg;
-import engine.net.client.msg.PowerProjectileMsg;
import engine.net.client.msg.UpdateStateMsg;
import engine.objects.*;
import engine.powers.ActionsBase;
@@ -110,7 +108,7 @@ public class MobAI {
if (mob.BehaviourType.callsForHelp)
MobCallForHelp(mob);
- if (!MovementUtilities.inRangeDropAggro(mob, target)) {
+ if (MovementUtilities.outOfAggroRange(mob, target)) {
mob.setCombatTarget(null);
return;
}
@@ -918,7 +916,7 @@ public class MobAI {
if(!mob.isCombat())
enterCombat(mob);
- if (mob.getCombatTarget().getObjectType().equals(Enum.GameObjectType.PlayerCharacter) && !MovementUtilities.inRangeDropAggro(mob, (PlayerCharacter) mob.getCombatTarget()) && mob.BehaviourType.ordinal() != Enum.MobBehaviourType.Pet1.ordinal()) {
+ if (mob.getCombatTarget().getObjectType().equals(Enum.GameObjectType.PlayerCharacter) && MovementUtilities.outOfAggroRange(mob, (PlayerCharacter) mob.getCombatTarget()) && mob.BehaviourType.ordinal() != Enum.MobBehaviourType.Pet1.ordinal()) {
mob.setCombatTarget(null);
return;
}
diff --git a/src/engine/mobileAI/utilities/MovementUtilities.java b/src/engine/mobileAI/utilities/MovementUtilities.java
index d2fa2d4b..ed8344ca 100644
--- a/src/engine/mobileAI/utilities/MovementUtilities.java
+++ b/src/engine/mobileAI/utilities/MovementUtilities.java
@@ -98,7 +98,7 @@ public class MovementUtilities {
}
- public static boolean inRangeDropAggro(Mob agent, AbstractCharacter target) {
+ public static boolean outOfAggroRange(Mob agent, AbstractCharacter target) {
Vector3fImmutable sl = agent.getLoc();
Vector3fImmutable tl = target.getLoc();