*Merge.

--HG--
branch : trunk

2 files changed, 3 insertions, 3 deletions

diff --git a/src/game/PetAI.cpp b/src/game/PetAI.cpp
index b85d675e6a4..925f68f7eec 100644
--- a/src/game/PetAI.cpp
+++ b/src/game/PetAI.cpp
@@ -38,7 +38,7 @@ int PetAI::Permissible(const Creature *creature)
     return PERMIT_BASE_NO;
 }
 
-PetAI::PetAI(Creature *c) : CreatureAI(c), i_pet(*c), i_tracker(TIME_INTERVAL_LOOK), inCombat(false)
+PetAI::PetAI(Creature *c) : CreatureAI(c), i_pet(*c), i_tracker(TIME_INTERVAL_LOOK)
 {
     m_AllySet.clear();
     UpdateAllies();
@@ -59,7 +59,6 @@ bool PetAI::_needToStop() const
 
 void PetAI::_stopAttack()
 {
-    inCombat = false;
     if( !i_pet.isAlive() )
     {
         DEBUG_LOG("Creature stoped attacking cuz his dead [guid=%u]", i_pet.GetGUIDLow());
@@ -126,6 +125,8 @@ void PetAI::UpdateAI(const uint32 diff)
 
     if (i_pet.GetGlobalCooldown() == 0 && !i_pet.hasUnitState(UNIT_STAT_CASTING))
     {
+        bool inCombat = me->getVictim();
+
         //Autocast
         for (uint8 i = 0; i < i_pet.GetPetAutoSpellSize(); i++)
         {
diff --git a/src/game/PetAI.h b/src/game/PetAI.h
index 056a9efa205..be38e03e13c 100644
--- a/src/game/PetAI.h
+++ b/src/game/PetAI.h
@@ -47,7 +47,6 @@ class TRINITY_DLL_DECL PetAI : public CreatureAI
         void UpdateAllies();
 
         Creature &i_pet;
-        bool inCombat;
         TimeTracker i_tracker;
         std::set<uint64> m_AllySet;
         uint32 m_updateAlliesTimer;