Changeset 200 for trunk/src/game/Player.cpp

Timestamp:

11/19/08 13:45:43 (17 years ago)

Author:

yumileroy

Message:

[svn] * Disabled the move and stay commands while pet is possessed
* Make pet come back to its owner after possession ends if it's not currently in combat
* Allow the possessed unit to properly change attack targets
* Also remove charm effects from charmed target on owner aura cancel

Original author: gvcoman
Date: 2008-11-08 23:32:15-06:00

Files:

• trunk/src/game/Player.cpp (modified) (1 diff)

trunk/src/game/Player.cpp

@@ -18765 +18765 @@
     {
         target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE);
+        // Reinitialize the pet bar and make the pet come back to the owner
         if(((Creature*)target)->isPet())
+        {
             PetSpellInitialize();
+            if (!target->getVictim())
+            {
+                target->GetMotionMaster()->MoveFollow(this, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE);
+                target->GetCharmInfo()->SetCommandState(COMMAND_FOLLOW);
+            }
+        }
         else if (target->isAlive())
         {