From 93389f32e296260657adf2d5cb906aec294c2db5 Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Wed, 5 Jan 2022 23:58:58 -0500
Subject: [PATCH] Scripts/ICC: little bit of cleanup in Valithria after the
 "recent" changes

Port From (https://github.com/TrinityCore/TrinityCore/commit/d7571e5d1f3b4cd5672a6344d96c782d7c83ea88)
---
 Source/Game/AI/CoreAI/CreatureAI.cs | 5 ++---
 Source/Game/Combat/CombatManager.cs | 9 +++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Source/Game/AI/CoreAI/CreatureAI.cs b/Source/Game/AI/CoreAI/CreatureAI.cs
index bb0b17e29..b69944fb6 100644
--- a/Source/Game/AI/CoreAI/CreatureAI.cs
+++ b/Source/Game/AI/CoreAI/CreatureAI.cs
@@ -79,11 +79,10 @@ namespace Game.AI
                 return;
             }
 
-            var playerList = map.GetPlayers();
-            if (playerList.Empty())
+            if (!map.HavePlayers())
                 return;
 
-            foreach (var player in playerList)
+            foreach (var player in map.GetPlayers())
             {
                 if (player != null)
                 {
diff --git a/Source/Game/Combat/CombatManager.cs b/Source/Game/Combat/CombatManager.cs
index 2537e26f7..4bf84695c 100644
--- a/Source/Game/Combat/CombatManager.cs
+++ b/Source/Game/Combat/CombatManager.cs
@@ -80,6 +80,15 @@ namespace Game.Combat
             }
         }
 
+        public bool HasPvECombatWithPlayers()
+        {
+            foreach (var reference in _pveRefs)
+                if (reference.Value.GetOther(_owner).IsPlayer())
+                    return true;
+
+            return false;
+        }
+        
         public bool HasPvPCombat()
         {
             foreach (var pair in _pvpRefs)