From e8f0e9f5de8c006b7b50f910a2a301d6e310dcb8 Mon Sep 17 00:00:00 2001
From: FatBoy-DOTC <justin.chucksinsulating@gmail.com>
Date: Fri, 17 May 2024 19:50:09 -0500
Subject: [PATCH] noob island guard aggro

---
 src/engine/mobileAI/MobAI.java | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/engine/mobileAI/MobAI.java b/src/engine/mobileAI/MobAI.java
index 5c2b8533..55ec0308 100644
--- a/src/engine/mobileAI/MobAI.java
+++ b/src/engine/mobileAI/MobAI.java
@@ -973,20 +973,7 @@ public class MobAI {
     }
 
     private static void hamletGuardAggro(Mob mob) {
-        City city = ZoneManager.getCityAtLocation(mob.bindLoc);
-        if(city != null && city.isNoobIsle == 1){
-            //noob island guards only aggro to mobs
-            HashSet<AbstractWorldObject> loadedMobs = WorldGrid.getObjectsInRangePartial(mob.loc, MobAIThread.AI_BASE_AGGRO_RANGE, MBServerStatics.MASK_MOB);
-            for (AbstractWorldObject awo : loadedMobs) {
-                Mob targetMob = (Mob) awo;
-                if (!targetMob.isAlive() || targetMob.despawned)
-                    continue;
-                if (targetMob.isPet())
-                    continue;
-                mob.combatTarget = targetMob;
-                return;
-            }
-        } else {
+
             HashSet<AbstractWorldObject> loadedPlayers = WorldGrid.getObjectsInRangePartial(mob.loc, MobAIThread.AI_BASE_AGGRO_RANGE, MBServerStatics.MASK_PLAYER);
             for (AbstractWorldObject awo : loadedPlayers) {
                 PlayerCharacter pc = (PlayerCharacter) awo;
@@ -1001,7 +988,6 @@ public class MobAI {
                 mob.combatTarget = pc;
                 return;
             }
-        }
     }
 
     private static void defaultLogic(Mob mob) {