Changeset 200 for trunk/src/game/SpellHandler.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/SpellHandler.cpp (modified) (1 diff)

trunk/src/game/SpellHandler.cpp

@@ -353 +353 @@
         return;
 
-    // Remove possess aura from the possessed as well
-    if(_player->isPossessing())
+    // Remove possess/charm aura from the possessed/charmed as well
+    // TODO: Remove this once the ability to cancel aura sets at once is implemented
+    if(_player->GetCharm())
     {
         for (int i = 0; i < 3; ++i)
         {
             if (spellInfo->EffectApplyAuraName[i] == SPELL_AURA_MOD_POSSESS ||
-                spellInfo->EffectApplyAuraName[i] == SPELL_AURA_MOD_POSSESS_PET)
+                spellInfo->EffectApplyAuraName[i] == SPELL_AURA_MOD_POSSESS_PET ||
+                spellInfo->EffectApplyAuraName[i] == SPELL_AURA_MOD_CHARM)
             {
                 _player->RemoveAurasDueToSpellByCancel(spellId);