aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorShocker <shocker@freakz.ro>2011-11-23 04:03:47 -0800
committerShocker <shocker@freakz.ro>2011-11-23 04:03:47 -0800
commite9cd4c6e808db5e2824b0cddd22d81f84770983e (patch)
tree9f189e9605a9eab69a31312aaacb6a6f6fcc22b7 /src
parentfffe60b0d9a6636a7c1222d8351a7b8fb05ebd11 (diff)
parente814cd8c35e30832d5e5a5129745283fafac20c6 (diff)
Merge pull request #3988 from kandera/tempbranch2
Core/Mechanic: Resurrection (fixed the issue with players ressing in pla...
Diffstat (limited to 'src')
-rwxr-xr-xsrc/server/game/Entities/Player/Player.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 9b1b2c34aaa..82e4ffe6769 100755
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -5087,8 +5087,6 @@ void Player::ResurrectPlayer(float restore_percent, bool applySickness)
if (GetSession()->IsARecruiter() || (GetSession()->GetRecruiterId() != 0))
SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_REFER_A_FRIEND);
- setDeathState(ALIVE);
-
SetMovement(MOVE_LAND_WALK);
SetMovement(MOVE_UNROOT);
@@ -5118,6 +5116,8 @@ void Player::ResurrectPlayer(float restore_percent, bool applySickness)
// update visibility
UpdateObjectVisibility();
+ setDeathState(ALIVE);
+
if (!applySickness)
return;