From 77e6d0db75e84d682bddc9d90f3196cb6ded41b2 Mon Sep 17 00:00:00 2001
From: FatBoy-DOTC <justin.chucksinsulating@gmail.com>
Date: Mon, 30 Dec 2024 17:24:46 -0600
Subject: [PATCH] player guards to drop aggro once player leaves city
---
src/engine/mobileAI/MobAI.java | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/src/engine/mobileAI/MobAI.java b/src/engine/mobileAI/MobAI.java
index 5b65c6ce..536d51f5 100644
--- a/src/engine/mobileAI/MobAI.java
+++ b/src/engine/mobileAI/MobAI.java
@@ -1052,9 +1052,22 @@ public class MobAI {
}
}
+ public static void checkToDropGuardAggro(Mob mob){
+ City city = mob.guardedCity;
+
+ if(city == null)
+ return;
+ if(mob.combatTarget == null)
+ return;
+
+ if(city._playerMemory.contains(mob.combatTarget.getObjectUUID()) && mob.combatTarget.getObjectType().equals(Enum.GameObjectType.PlayerCharacter))
+ mob.setCombatTarget(null);
+ }
+
public static void GuardCaptainLogic(Mob mob) {
try {
+ checkToDropGuardAggro(mob);
if (mob.getCombatTarget() == null)
CheckForPlayerGuardAggro(mob);
@@ -1079,6 +1092,8 @@ public class MobAI {
public static void GuardMinionLogic(Mob mob) {
try {
+ checkToDropGuardAggro(mob);
+
boolean isComanded = mob.npcOwner.isAlive();
if (!isComanded) {
GuardCaptainLogic(mob);
@@ -1099,6 +1114,8 @@ public class MobAI {
public static void GuardWallArcherLogic(Mob mob) {
try {
+ checkToDropGuardAggro(mob);
+
if (mob.getCombatTarget() == null)
CheckForPlayerGuardAggro(mob);
else