|
|
|
@ -580,13 +580,10 @@ public class MobAI {
@@ -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) { |
|
|
|
|