From 799269c79e9f9ddded8bdece301e5b86590df50f Mon Sep 17 00:00:00 2001
From: jadebenn <jadebenn@users.noreply.github.com>
Date: Wed, 20 Dec 2023 15:12:01 -0600
Subject: [PATCH] fix: Using 'leave-zone' in Return to the Venture Explorer
 allows players to return to the original Venture Explorer map (#1341)

* fixed VE zone bug and added config option to renable it

* add zero back to LWOMAPID initialization

* typo

* removed config option to enable bug
---
 dGame/dUtilities/SlashCommandHandler.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/dGame/dUtilities/SlashCommandHandler.cpp b/dGame/dUtilities/SlashCommandHandler.cpp
index 7c18e9a4..39f4a115 100644
--- a/dGame/dUtilities/SlashCommandHandler.cpp
+++ b/dGame/dUtilities/SlashCommandHandler.cpp
@@ -288,11 +288,13 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 		return;
 	}
 
-	if (chatCommand == "leave-zone") {
+	if (chatCommand == "leave-zone" || chatCommand == "leavezone") {
 		const auto currentZone = Game::zoneManager->GetZone()->GetZoneID().GetMapID();
-
 		LWOMAPID newZone = 0;
-		if (currentZone % 100 == 0) {
+
+		if (currentZone == 1001) {
+			newZone = 1100; // Send to AG if we're in a Return to Venture Explorer instance
+		} else if (currentZone % 100 == 0) {
 			ChatPackets::SendSystemMessage(sysAddr, u"You are not in an instanced zone.");
 			return;
 		} else {