From bdd3dc43a3ba7a46d76d852871f2dbae277c6719 Mon Sep 17 00:00:00 2001 From: stormrage-project Date: Mon, 7 Sep 2015 14:45:27 +0200 Subject: [PATCH] [Maps] Ensure the resurrection when entering instantiable map --- src/game/Object/Player.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/game/Object/Player.cpp b/src/game/Object/Player.cpp index c57c826d..5e85e930 100644 --- a/src/game/Object/Player.cpp +++ b/src/game/Object/Player.cpp @@ -1560,6 +1560,11 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati SendTransferAbortedByLockStatus(mEntry, lockStatus, miscRequirement); return false; } + if (IsDead()) // rare case of teleporting the player into an instance with no areatrigger participation + { + ResurrectPlayer(0.5f); + SpawnCorpseBones(); + } } // if we were on a transport, leave