From 025d0707522a2038ac7f096c4f90b4107a6872a9 Mon Sep 17 00:00:00 2001
From: click <none@none>
Date: Fri, 26 Nov 2010 02:02:05 +0100
Subject: [PATCH] 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
---
 src/server/game/Entities/Unit/Unit.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index e5291f2827..7ce0b846f7 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);