From 0dd478b9f0a17590d1a6fdf0d757176ec17072ad Mon Sep 17 00:00:00 2001
From: dongresource <dongresource@protonmail.com>
Date: Tue, 15 Dec 2020 23:11:10 +0100
Subject: [PATCH] Tweak Lair respawns slightly

* Respawn the player in the air, not on the ground
* Do save the player's current instance, just to lessen the chance of
validation not catching stale recall coords.
---
 src/NPCManager.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/NPCManager.cpp b/src/NPCManager.cpp
index 3309a96..eddd5f5 100644
--- a/src/NPCManager.cpp
+++ b/src/NPCManager.cpp
@@ -506,7 +506,8 @@ void NPCManager::handleWarp(CNSocket* sock, int32_t warpId) {
             // save Lair entrance coords as a pseudo-Resurrect 'Em
             plr->recallX = Warps[warpId].x;
             plr->recallY = Warps[warpId].y;
-            plr->recallZ = Warps[warpId].z;
+            plr->recallZ = Warps[warpId].z + RESURRECT_HEIGHT;
+            plr->recallInstance = instanceID;
         }
 
         if (plr->iID == plr->iIDGroup && plr->groupCnt == 1)