From 02cdbdd538acaf80677451b4e19cf3f18f7cb9f6 Mon Sep 17 00:00:00 2001 From: Axel Cocat Date: Mon, 4 Oct 2021 15:45:54 +0200 Subject: [PATCH] fix(Core/Player): check for existing corpse on respawn (#8112) --- src/server/game/Entities/Player/Player.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 6b2271396..7c88097c6 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -4273,7 +4273,7 @@ void Player::BuildPlayerRepop() // the player cannot have a corpse already on current map, only bones which are not returned by GetCorpse WorldLocation corpseLocation = GetCorpseLocation(); - if (corpseLocation.GetMapId() == GetMapId()) + if (GetCorpse() && corpseLocation.GetMapId() == GetMapId()) { LOG_ERROR("entities.player", "BuildPlayerRepop: player %s (%s) already has a corpse", GetName().c_str(), GetGUID().ToString().c_str()); return;