Core/Unit: Fix pets aggromode - do not set player in combat untill pet has actually done damage to target (fix by Kaelima)

Closes issue 4894.

--HG--
branch : trunk

1 files changed, 1 insertions, 1 deletions

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index e5291f28271..7ce0b846f7a 100755
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -9389,7 +9389,7 @@ bool Unit::Attack(Unit *victim, bool meleeAttack)
     //if (GetTypeId() == TYPEID_UNIT)
     //    this->ToCreature()->SetCombatStartPosition(GetPositionX(), GetPositionY(), GetPositionZ());
 
-    if (GetTypeId() == TYPEID_UNIT)
+    if (GetTypeId() == TYPEID_UNIT && !this->ToCreature()->IsPet())
     {
         // should not let player enter combat by right clicking target
         SetInCombatWith(victim);