Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Players: fix null dereference crash

Browse Source 
(cherry picked from commit c3176a8143)
This commit is contained in:
ariel-
2017-05-06 15:49:56 -03:00
committed by funjoker
parent 57e3a67c94
commit 43339e6840
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/server/game/Entities/Player/Player.cpp
View File

@@ -25390,18 +25390,24 @@ void Player::ResurrectUsingRequestData()
void Player::ResurrectUsingRequestDataImpl()
{
// save health and mana before resurrecting, _resurrectionData can be erased
uint32 resurrectHealth = _resurrectionData->Health;
uint32 resurrectMana = _resurrectionData->Mana;
uint32 resurrectAura = _resurrectionData->Aura;
ObjectGuid resurrectGUID = _resurrectionData->GUID;
ResurrectPlayer(0.0f, false);
SetHealth(_resurrectionData->Health);
SetPower(POWER_MANA, _resurrectionData->Mana);
SetHealth(resurrectHealth);
SetPower(POWER_MANA, resurrectMana);
SetPower(POWER_RAGE, 0);
SetFullPower(POWER_ENERGY);
SetFullPower(POWER_FOCUS);
SetPower(POWER_LUNAR_POWER, 0);
if (uint32 aura = _resurrectionData->Aura)
CastSpell(this, aura, true, nullptr, nullptr, _resurrectionData->GUID);
if (uint32 aura = resurrectAura)
CastSpell(this, aura, true, nullptr, nullptr, resurrectGUID);
SpawnCorpseBones();
}