guards will revert cmbat target to null if its a player and is no longer loaded

2023-09-09 22:23:25 -05:00
parent 501e8c937f
commit ea86ab2300
1 changed files with 4 additions and 7 deletions
@@ -580,13 +580,10 @@ public class MobAI {

            //no players loaded, no need to proceed unless it's a player guard
            boolean bypassLoadedPlayerCheck = false;
-            if(mob.isPlayerGuard()) {
-
-                if (mob.guardedCity != null) {
-                    if (!mob.guardedCity._playerMemory.isEmpty()) {
-                        bypassLoadedPlayerCheck = true;
-                    }
-                }
+            if(mob.isPlayerGuard() || mob.isSiege()) {
+                bypassLoadedPlayerCheck = true;
+                if(mob.combatTarget != null && !mob.playerAgroMap.containsKey(mob.combatTarget.getObjectUUID()) && mob.combatTarget.getObjectType().equals(Enum.GameObjectType.PlayerCharacter))
+                    mob.setCombatTarget(null);
            }

            if (mob.playerAgroMap.isEmpty() && !bypassLoadedPlayerCheck) {