From 155041498393ef275c8bc3549aa7af6bf512b05e Mon Sep 17 00:00:00 2001
From: Adam <adam@notadam.me>
Date: Mon, 29 Jan 2018 20:41:24 +1100
Subject: [PATCH] return players to last zone if the instance doesnt exist

---
 src/servers/sapphire_zone/Actor/Player.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/servers/sapphire_zone/Actor/Player.cpp b/src/servers/sapphire_zone/Actor/Player.cpp
index 7e271f93..fa8c1d3b 100644
--- a/src/servers/sapphire_zone/Actor/Player.cpp
+++ b/src/servers/sapphire_zone/Actor/Player.cpp
@@ -366,7 +366,15 @@ void Core::Entity::Player::returnToHomepoint()
 void Core::Entity::Player::setZone( uint32_t zoneId )
 {
    if( !g_territoryMgr.movePlayer( zoneId, getAsPlayer() ) )
-      return;
+   {
+      // todo: this will require proper handling, for now just return the player to their previous area
+      m_pos = m_prevPos;
+      m_rot = m_prevRot;
+      m_zoneId = m_prevZoneId;
+
+      if( !g_territoryMgr.movePlayer( m_zoneId, getAsPlayer() ) )
+         return;
+   }
 
    sendZonePackets();
 }