Merge pull request #3988 from kandera/tempbranch2

Core/Mechanic: Resurrection (fixed the issue with players ressing in pla...
This commit is contained in:
Shocker
2011-11-23 04:03:47 -08:00
+2 -2
View File
@@ -5087,8 +5087,6 @@ void Player::ResurrectPlayer(float restore_percent, bool applySickness)
if (GetSession()->IsARecruiter() || (GetSession()->GetRecruiterId() != 0)) if (GetSession()->IsARecruiter() || (GetSession()->GetRecruiterId() != 0))
SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_REFER_A_FRIEND); SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_REFER_A_FRIEND);
setDeathState(ALIVE);
SetMovement(MOVE_LAND_WALK); SetMovement(MOVE_LAND_WALK);
SetMovement(MOVE_UNROOT); SetMovement(MOVE_UNROOT);
@@ -5118,6 +5116,8 @@ void Player::ResurrectPlayer(float restore_percent, bool applySickness)
// update visibility // update visibility
UpdateObjectVisibility(); UpdateObjectVisibility();
setDeathState(ALIVE);
if (!applySickness) if (!applySickness)
return; return;