ElderShell/EverWrath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(Core/Corpses): Reset corpse location data if player already resurrected in different dungeon map. (#9429)

Browse source 
Fixes #9210
This commit is contained in:
UltraNix 2021-12-06 18:48:46 +01:00 • committed by GitHub
parent 7d3aeb4b25
commit d0167d0d6d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/server/game/Entities/Player/Player.cpp
View file

@ -4514,6 +4514,8 @@ void Player::RemoveCorpse()
CharacterDatabaseTransaction trans = CharacterDatabase.BeginTransaction();
Corpse::DeleteFromDB(GetGUID(), trans);
CharacterDatabase.CommitTransaction(trans);
_corpseLocation.WorldRelocate();
}
void Player::SpawnCorpseBones(bool triggerSave /*= true*/)

4
src/server/game/Handlers/MovementHandler.cpp
View file

@ -193,7 +193,7 @@ void WorldSession::HandleMoveWorldportAck()
{
if (mEntry->IsDungeon())
{
GetPlayer()->ResurrectPlayer(0.5f, false);
GetPlayer()->ResurrectPlayer(0.5f);
GetPlayer()->SpawnCorpseBones();
}
}
@ -203,7 +203,7 @@ void WorldSession::HandleMoveWorldportAck()
// resurrect character upon entering instance when the corpse is not available anymore
if (GetPlayer()->GetCorpseLocation().GetMapId() == mEntry->MapID)
{
GetPlayer()->ResurrectPlayer(0.5f, false);
GetPlayer()->ResurrectPlayer(0.5f);
GetPlayer()->RemoveCorpse();
}
}