diff options
| author | Shauren <shauren.trinity@gmail.com> | 2015-09-28 17:20:27 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2015-09-29 18:45:01 +0200 |
| commit | 402a3c45ffe65597d9863dce5fb76362795d706a (patch) | |
| tree | 2820239fa3e7c535306c2aa9f544b2ca13607126 /src/server/game/Handlers/MovementHandler.cpp | |
| parent | 70a5cdfc04f510d39af5ea050757f33804ae7723 (diff) | |
Core/Maps: Moved corpse management to map level
(cherry picked from commit cd27fd38b93884797c094a82dc7beb0498e2f124)
# Conflicts:
# src/server/database/Database/Implementation/CharacterDatabase.cpp
# src/server/database/Database/Implementation/CharacterDatabase.h
# src/server/game/Entities/Corpse/Corpse.cpp
# src/server/game/Entities/Creature/GossipDef.cpp
# src/server/game/Entities/Player/Player.cpp
# src/server/game/Entities/Player/Player.h
# src/server/game/Globals/ObjectAccessor.cpp
# src/server/game/Globals/ObjectAccessor.h
# src/server/game/Globals/ObjectMgr.cpp
# src/server/game/Globals/ObjectMgr.h
# src/server/game/Grids/ObjectGridLoader.cpp
# src/server/game/Handlers/AuctionHouseHandler.cpp
# src/server/game/Handlers/CharacterHandler.cpp
# src/server/game/Handlers/ChatHandler.cpp
# src/server/game/Handlers/QueryHandler.cpp
# src/server/game/Maps/Map.cpp
# src/server/game/Server/Packets/CharacterPackets.cpp
# src/server/game/World/World.cpp
# src/server/scripts/Commands/cs_reload.cpp
Diffstat (limited to 'src/server/game/Handlers/MovementHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/MovementHandler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Handlers/MovementHandler.cpp b/src/server/game/Handlers/MovementHandler.cpp index 518baa42e97..84816bf3f33 100644 --- a/src/server/game/Handlers/MovementHandler.cpp +++ b/src/server/game/Handlers/MovementHandler.cpp @@ -142,8 +142,8 @@ void WorldSession::HandleMoveWorldportAckOpcode() } // resurrect character at enter into instance where his corpse exist after add to map - Corpse* corpse = GetPlayer()->GetCorpse(); - if (corpse && corpse->GetType() != CORPSE_BONES && corpse->GetMapId() == GetPlayer()->GetMapId()) + Corpse* corpse = GetPlayer()->GetMap()->GetCorpseByPlayer(GetPlayer()->GetGUID()); + if (corpse && corpse->GetType() != CORPSE_BONES) { if (mEntry->IsDungeon()) { |