[7348] Remove hack code from IsDeathPersistentSpell. Author: VladimirMangos
Re-apply zone dependent auras at resurrection by triggering zone update for player. --HG-- branch : trunk
This commit is contained in:
+3
-3
@@ -3972,13 +3972,13 @@ void Player::ResurrectPlayer(float restore_percent, bool applySickness)
|
|||||||
SetPower(POWER_ENERGY, uint32(GetMaxPower(POWER_ENERGY)*restore_percent));
|
SetPower(POWER_ENERGY, uint32(GetMaxPower(POWER_ENERGY)*restore_percent));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// trigger update zone for alive state zone updates
|
||||||
|
UpdateZone(GetZoneId());
|
||||||
|
|
||||||
// update visibility
|
// update visibility
|
||||||
//ObjectAccessor::UpdateVisibilityForPlayer(this);
|
//ObjectAccessor::UpdateVisibilityForPlayer(this);
|
||||||
SetToNotify();
|
SetToNotify();
|
||||||
|
|
||||||
// some items limited to specific map
|
|
||||||
DestroyZoneLimitedItem( true, GetZoneId());
|
|
||||||
|
|
||||||
if(!applySickness)
|
if(!applySickness)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|||||||
+1
-9
@@ -391,14 +391,6 @@ inline bool IsPassiveSpellStackableWithRanks(SpellEntry const* spellProto)
|
|||||||
|
|
||||||
inline bool IsDeathPersistentSpell(SpellEntry const *spellInfo)
|
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;
|
return spellInfo->AttributesEx3 & SPELL_ATTR_EX3_DEATH_PERSISTENT;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1114,7 +1106,7 @@ class SpellMgr
|
|||||||
SpellPetAuraMap mSpellPetAuraMap;
|
SpellPetAuraMap mSpellPetAuraMap;
|
||||||
SpellCustomAttribute mSpellCustomAttr;
|
SpellCustomAttribute mSpellCustomAttr;
|
||||||
SpellLinkedMap mSpellLinkedMap;
|
SpellLinkedMap mSpellLinkedMap;
|
||||||
PetLevelupSpellMap mPetLevelupSpellMap;
|
PetLevelupSpellMap mPetLevelupSpellMap;
|
||||||
};
|
};
|
||||||
|
|
||||||
#define spellmgr SpellMgr::Instance()
|
#define spellmgr SpellMgr::Instance()
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#ifndef __REVISION_NR_H__
|
#ifndef __REVISION_NR_H__
|
||||||
#define __REVISION_NR_H__
|
#define __REVISION_NR_H__
|
||||||
#define REVISION_NR "7347"
|
#define REVISION_NR "7348"
|
||||||
#endif // __REVISION_NR_H__
|
#endif // __REVISION_NR_H__
|
||||||
|
|||||||
Reference in New Issue
Block a user