[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

--HG--
branch : trunk

1 files changed, 4 insertions, 1 deletions

diff --git a/src/game/PossessedAI.cpp b/src/game/PossessedAI.cpp
index b66a648294f..6b803303185 100644
--- a/src/game/PossessedAI.cpp
+++ b/src/game/PossessedAI.cpp
@@ -24,9 +24,12 @@
 

 void PossessedAI::AttackStart(Unit *u)

 {

-    if( i_pet.getVictim() || !u )

+    if( !u )

         return;

 

+    if (i_pet.getVictim() && u != i_pet.getVictim())

+        i_pet.AttackStop();

+

     if(i_pet.Attack(u, true))

         i_victimGuid = u->GetGUID();