Changeset 174 for trunk/src/game/SpellHandler.cpp

Timestamp:

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

Author:

yumileroy

Message:

[svn] Implemented player on player and player on creature possession:
* Implemented packet and vision forwarding through possessed units
* Added new OnPossess? script call alerting scripts on when possession is applied/removed
* Moved fall damage and fall under map calculations into the Player class
* Added new PossessedAI that is applied only while possession on creature is active
* Implemented summon possessed spell effect
* Fixed Eyes of the Beast

Original author: gvcoman
Date: 2008-11-05 20:51:05-06:00

Files:

• trunk/src/game/SpellHandler.cpp (modified) (2 diffs)

trunk/src/game/SpellHandler.cpp

@@ -303 +303 @@
     }
 
+    // can't use our own spells when we're in possession of another unit,
+    if(_player->isPossessing())
+        return;
+
     // client provided targets
     SpellCastTargets targets;
@@ -348 +352 @@
     if (!spellInfo)
         return;
+
+    // Remove possess aura from the possessed as well
+    if(_player->isPossessing())
+    {
+        for (int i = 0; i < 3; ++i)
+        {
+            if (spellInfo->EffectApplyAuraName[i] == SPELL_AURA_MOD_POSSESS ||
+                spellInfo->EffectApplyAuraName[i] == SPELL_AURA_MOD_POSSESS_PET)
+            {
+                _player->RemoveAurasDueToSpellByCancel(spellId);
+                _player->GetCharm()->RemoveAurasDueToSpellByCancel(spellId);
+                return;
+            }
+        }
+    }
 
     // not allow remove non positive spells and spells with attr SPELL_ATTR_CANT_CANCEL