From b75741ff4efa032cfea517f59eee5470b5a6a12e Mon Sep 17 00:00:00 2001
From: Kinglykrab <89047260+Kinglykrab@users.noreply.github.com>
Date: Sun, 13 Mar 2022 15:59:57 -0400
Subject: [PATCH] [Bug Fix] Fix possible crash with zone name methods. (#2055)

- ZoneLongName and ZoneName were returning nullptr in places that were then attempting to use that nullptr value, causing zone crashes.
---
 zone/lua_general.cpp | 7 ++++---
 zone/questmgr.cpp    | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/zone/lua_general.cpp b/zone/lua_general.cpp
index b6d1d93b8..067050a1a 100644
--- a/zone/lua_general.cpp
+++ b/zone/lua_general.cpp
@@ -1146,12 +1146,13 @@ const char *lua_get_zone_long_name() {
 
 const char *lua_get_zone_long_name_by_name(const char* zone_name) {
 	return ZoneLongName(
-		ZoneID(zone_name)
+		ZoneID(zone_name),
+		true
 	);
 }
 
 const char *lua_get_zone_long_name_by_id(uint32 zone_id) {
-	return ZoneLongName(zone_id);
+	return ZoneLongName(zone_id, true);
 }
 
 const char *lua_get_zone_short_name() {
@@ -1162,7 +1163,7 @@ const char *lua_get_zone_short_name() {
 }
 
 const char *lua_get_zone_short_name_by_id(uint32 zone_id) {
-	return ZoneName(zone_id);
+	return ZoneName(zone_id, true);
 }
 
 int lua_get_zone_instance_id() {
diff --git a/zone/questmgr.cpp b/zone/questmgr.cpp
index 02ffb60df..599204a5c 100644
--- a/zone/questmgr.cpp
+++ b/zone/questmgr.cpp
@@ -3234,15 +3234,15 @@ int32 QuestManager::GetZoneID(const char *zone) {
 
 std::string QuestManager::GetZoneLongName(std::string zone_short_name)
 {
-	return ZoneLongName(ZoneID(zone_short_name));
+	return ZoneLongName(ZoneID(zone_short_name), true);
 }
 
 std::string QuestManager::GetZoneLongNameByID(uint32 zone_id) {
-	return ZoneLongName(zone_id);
+	return ZoneLongName(zone_id, true);
 }
 
 std::string QuestManager::GetZoneShortName(uint32 zone_id) {
-	return ZoneName(zone_id);
+	return ZoneName(zone_id, true);
 }
 
 bool QuestManager::EnableRecipe(uint32 recipe_id)