diff options
Diffstat (limited to 'src/game/MiscHandler.cpp')
-rw-r--r-- | src/game/MiscHandler.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/game/MiscHandler.cpp b/src/game/MiscHandler.cpp index 337bf0074f3..5864da2e914 100644 --- a/src/game/MiscHandler.cpp +++ b/src/game/MiscHandler.cpp @@ -713,6 +713,10 @@ void WorldSession::HandleBugOpcode(WorldPacket & recv_data) void WorldSession::HandleReclaimCorpseOpcode(WorldPacket &recv_data) { sLog.outDetail("WORLD: Received CMSG_RECLAIM_CORPSE"); + + uint64 guid; + recv_data >> guid; + if (GetPlayer()->isAlive()) return; @@ -736,9 +740,6 @@ void WorldSession::HandleReclaimCorpseOpcode(WorldPacket &recv_data) if (!corpse->IsWithinDistInMap(GetPlayer(), CORPSE_RECLAIM_RADIUS, true)) return; - uint64 guid; - recv_data >> guid; - // resurrect GetPlayer()->ResurrectPlayer(GetPlayer()->InBattleGround() ? 1.0f : 0.5f); @@ -750,14 +751,14 @@ void WorldSession::HandleResurrectResponseOpcode(WorldPacket & recv_data) { sLog.outDetail("WORLD: Received CMSG_RESURRECT_RESPONSE"); - if (GetPlayer()->isAlive()) - return; - uint64 guid; uint8 status; recv_data >> guid; recv_data >> status; + if (GetPlayer()->isAlive()) + return; + if (status == 0) { GetPlayer()->clearResurrectRequestData(); // reject |