Changeset 191 for trunk

Timestamp:

11/19/08 13:44:57 (17 years ago)

Author:

yumileroy

Message:

[svn] Fixed pets stopping attack after pressing the attack button multiple times.

Original author: gvcoman
Date: 2008-11-07 18:46:25-06:00

Location:

trunk/src/game

Files:

• PetAI.cpp (modified) (1 diff)
• PetHandler.cpp (modified) (2 diffs)

trunk/src/game/PetAI.cpp

@@ -66 +66 @@
 void PetAI::AttackStart(Unit *u)
 {
-    if( inCombat || !u || (i_pet.isPet() && ((Pet&)i_pet).getPetType() == MINI_PET) )
-        return;
+    if( !u || (i_pet.isPet() && ((Pet&)i_pet).getPetType() == MINI_PET) )
+        return;
+
+    if (inCombat && i_pet.getVictim() && u != i_pet.getVictim())
+        i_pet.AttackStop();
 
     if(i_pet.Attack(u,true))

trunk/src/game/PetHandler.cpp

@@ -105 +105 @@
                         return;
 
-                    if(pet->getVictim())
-                        pet->AttackStop();
-
                     if(pet->GetTypeId() != TYPEID_PLAYER)
                     {
@@ -124 +121 @@
                     else                                    // charmed player
                     {
+                        if(pet->getVictim() && pet->getVictim() != TargetUnit)
+                            pet->AttackStop();
+
                         pet->Attack(TargetUnit,true);
                         pet->SendPetAIReaction(guid1);