From 3561d52b109a566d4300e8b87ec4e4fc99a4d2ad Mon Sep 17 00:00:00 2001
From: talamortis <talamortis@gmail.com>
Date: Sat, 1 Jul 2017 23:28:17 +0100
Subject: [PATCH] PetAI update

---
 src/game/AI/CoreAI/PetAI.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/game/AI/CoreAI/PetAI.cpp b/src/game/AI/CoreAI/PetAI.cpp
index be2d536b9..2ff2422eb 100644
--- a/src/game/AI/CoreAI/PetAI.cpp
+++ b/src/game/AI/CoreAI/PetAI.cpp
@@ -99,6 +99,13 @@ void PetAI::UpdateAI(uint32 diff)
 
     Unit* owner = me->GetCharmerOrOwner();
 
+    //if Pet is in combat put player in combat
+    if (owner->HasAuraType(SPELL_AURA_MOD_STEALTH) || owner->HasAuraType(SPELL_AURA_FEIGN_DEATH))
+        return;
+    else
+        if (me->IsInCombat())
+            owner->IsInCombat();
+
     if (m_updateAlliesTimer <= diff)
         // UpdateAllies self set update timer
         UpdateAllies();
@@ -307,13 +314,6 @@ void PetAI::UpdateAllies()
     else if (owner->GetTypeId() == TYPEID_PLAYER)
         group = owner->ToPlayer()->GetGroup();
 
-    //if Pet is in combat put player in combat
-    if (owner->HasAuraType(SPELL_AURA_MOD_STEALTH) || owner->HasAuraType(SPELL_AURA_FEIGN_DEATH))
-        return;
-    else
-        if (me->IsInCombat())
-            owner->IsInCombat();
-
     //only pet and owner/not in group->ok
     if (m_AllySet.size() == 2 && !group)
         return;