From 959a70817611ffd3b9d19938afd5f0713a407abb Mon Sep 17 00:00:00 2001
From: dongresource <dongresource@protonmail.com>
Date: Thu, 24 Dec 2020 06:05:05 +0100
Subject: [PATCH] Return to the overworld instance when warping to a buddy

---
 src/BuddyManager.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/BuddyManager.cpp b/src/BuddyManager.cpp
index ca581c4..01e1438 100644
--- a/src/BuddyManager.cpp
+++ b/src/BuddyManager.cpp
@@ -534,7 +534,8 @@ void BuddyManager::reqBuddyWarp(CNSocket* sock, CNPacketData* data) {
         return;
     }
 
-    PlayerManager::sendPlayerTo(sock, otherPlr->x, otherPlr->y, otherPlr->z);
+    // otherPlr->instanceID should always be INSTANCE_OVERWORLD at this point
+    PlayerManager::sendPlayerTo(sock, otherPlr->x, otherPlr->y, otherPlr->z, otherPlr->instanceID);
 }
 
 void BuddyManager::emailUpdateCheck(CNSocket* sock, CNPacketData* data) {