*Fix a bug that pet/charmed cannot AOE neutral creatures.

--HG--
branch : trunk

1 files changed, 3 insertions, 1 deletions

diff --git a/src/game/Unit.h b/src/game/Unit.h
index 4d328042f53..64aeafaeed4 100644
--- a/src/game/Unit.h
+++ b/src/game/Unit.h
@@ -1214,7 +1214,6 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
         virtual void setDeathState(DeathState s);           // overwrited in Creature/Player/Pet
 
         uint64 GetOwnerGUID() const { return  GetUInt64Value(UNIT_FIELD_SUMMONEDBY); }
-        void SetOwnerGUID(uint64 owner) { SetUInt64Value(UNIT_FIELD_SUMMONEDBY, owner); }
         uint64 GetCreatorGUID() const { return GetUInt64Value(UNIT_FIELD_CREATEDBY); }
         void SetCreatorGUID(uint64 creator) { SetUInt64Value(UNIT_FIELD_CREATEDBY, creator); }
         uint64 GetGuardianGUID() const { return GetUInt64Value(UNIT_FIELD_SUMMON); }
@@ -1225,6 +1224,7 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
         void SetPetGUID(uint64 guid) { m_SummonSlot[SUMMON_SLOT_PET] = guid; }
         uint64 GetPetGUID() const { return m_SummonSlot[SUMMON_SLOT_PET]; }
 
+        bool IsControlledByPlayer() const { return m_ControlledByPlayer; }
         uint64 GetCharmerOrOwnerGUID() const { return GetCharmerGUID() ? GetCharmerGUID() : GetOwnerGUID(); }
         uint64 GetCharmerOrOwnerOrOwnGUID() const
         {
@@ -1624,6 +1624,8 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
         float GetTransOffsetO() const { return m_movementInfo.t_o; }
         uint32 GetTransTime()   const { return m_movementInfo.t_time; }
         int8 GetTransSeat()     const { return m_movementInfo.t_seat; }
+
+        bool m_ControlledByPlayer;
     protected:
         explicit Unit ();