[7348] Remove hack code from IsDeathPersistentSpell. Author: VladimirMangos

    Re-apply zone dependent auras at resurrection by triggering zone update for player.

--HG--
branch : trunk

3 files changed, 5 insertions, 13 deletions

diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 50af6a798c8..a41abff3a78 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -3972,13 +3972,13 @@ void Player::ResurrectPlayer(float restore_percent, bool applySickness)
         SetPower(POWER_ENERGY, uint32(GetMaxPower(POWER_ENERGY)*restore_percent));
     }
 
+    // trigger update zone for alive state zone updates
+    UpdateZone(GetZoneId());
+
     // update visibility
     //ObjectAccessor::UpdateVisibilityForPlayer(this);
     SetToNotify();
 
-    // some items limited to specific map
-    DestroyZoneLimitedItem( true, GetZoneId());
-
     if(!applySickness)
         return;
 
diff --git a/src/game/SpellMgr.h b/src/game/SpellMgr.h
index 119dbed9eb8..242390477ec 100644
--- a/src/game/SpellMgr.h
+++ b/src/game/SpellMgr.h
@@ -391,14 +391,6 @@ inline bool IsPassiveSpellStackableWithRanks(SpellEntry const* spellProto)
 
 inline bool IsDeathPersistentSpell(SpellEntry const *spellInfo)
 {
-    switch(spellInfo->Id)
-    {
-        case 40214:                                     // Dragonmaw Illusion
-        case 35480: case 35481: case 35482:             // Human Illusion
-        case 35483: case 39824:                         // Human Illusion
-            return true;
-    }
-
     return spellInfo->AttributesEx3 & SPELL_ATTR_EX3_DEATH_PERSISTENT;
 }
 
@@ -1114,7 +1106,7 @@ class SpellMgr
         SpellPetAuraMap     mSpellPetAuraMap;
         SpellCustomAttribute  mSpellCustomAttr;
         SpellLinkedMap      mSpellLinkedMap;
-        PetLevelupSpellMap mPetLevelupSpellMap;
+        PetLevelupSpellMap  mPetLevelupSpellMap;
 };
 
 #define spellmgr SpellMgr::Instance()
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 9ab590e6486..ede9681cf62 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "7347"
+ #define REVISION_NR "7348"
 #endif // __REVISION_NR_H__