From d7e09a1f3b31af41cf0d6623d0288934a3a98dd7 Mon Sep 17 00:00:00 2001
From: Akkadius <akkadius1@gmail.com>
Date: Mon, 28 Aug 2023 19:51:11 -0500
Subject: [PATCH] [Hotfix] Zoning logging edge case safety

---
 zone/zoning.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/zone/zoning.cpp b/zone/zoning.cpp
index 98c9ba4e4..c76e49e98 100644
--- a/zone/zoning.cpp
+++ b/zone/zoning.cpp
@@ -59,7 +59,7 @@ void Client::Handle_OP_ZoneChange(const EQApplicationPacket *app) {
 		"Client [{}] char_name [{}] zoning to [{}] ({}) instance_id [{}] x [{}] y [{}] z [{}] zone_reason [{}] success [{}] zone_mode [{}] ({})",
 		GetCleanName(),
 		zc->char_name,
-		ZoneName(zc->zoneID),
+		ZoneName(zc->zoneID) ? ZoneName(zc->zoneID) : "Unknown",
 		zc->zoneID,
 		zc->instanceID,
 		zc->x,
@@ -152,7 +152,7 @@ void Client::Handle_OP_ZoneChange(const EQApplicationPacket *app) {
 			"Client [{}] attempting zone to instance_id [{}] zone [{}] ({})",
 			GetCleanName(),
 			target_instance_id,
-			ZoneName(target_zone_id),
+			ZoneName(target_zone_id) ? ZoneName(target_zone_id) : "Unknown",
 			target_zone_id
 		);
 
@@ -388,7 +388,7 @@ void Client::SendZoneCancel(ZoneChange_Struct *zc) {
 		"(zs) Client [{}] char_name [{}] zoning to [{}] ({}) cancelled instance_id [{}] x [{}] y [{}] z [{}] zone_reason [{}] success [{}]",
 		GetCleanName(),
 		zc->char_name,
-		ZoneName(zc2->zoneID),
+		ZoneName(zc2->zoneID) ? ZoneName(zc2->zoneID) : "Unknown",
 		zc->zoneID,
 		zc->instanceID,
 		zc->x,
@@ -408,7 +408,7 @@ void Client::SendZoneCancel(ZoneChange_Struct *zc) {
 		"(zc2) Client [{}] char_name [{}] zoning to [{}] ({}) cancelled instance_id [{}] x [{}] y [{}] z [{}] zone_reason [{}] success [{}]",
 		GetCleanName(),
 		zc2->char_name,
-		ZoneName(zc2->zoneID),
+		ZoneName(zc2->zoneID) ? ZoneName(zc2->zoneID) : "Unknown",
 		zc2->zoneID,
 		zc2->instanceID,
 		zc2->x,
@@ -443,7 +443,7 @@ void Client::SendZoneError(ZoneChange_Struct *zc, int8 err)
 		"Client [{}] char_name [{}] zoning to [{}] ({}) (error) instance_id [{}] x [{}] y [{}] z [{}] zone_reason [{}] success [{}]",
 		GetCleanName(),
 		zc2->char_name,
-		ZoneName(zc2->zoneID),
+		ZoneName(zc2->zoneID) ? ZoneName(zc2->zoneID) : "Unknown",
 		zc2->zoneID,
 		zc2->instanceID,
 		zc2->x,
@@ -493,7 +493,7 @@ void Client::DoZoneSuccess(ZoneChange_Struct *zc, uint16 zone_id, uint32 instanc
 		"Client [{}] char_name [{}] zoning to [{}] ({}) instance_id [{}] x [{}] y [{}] z [{}] zone_reason [{}] success [{}]",
 		GetCleanName(),
 		zc->char_name,
-		ZoneName(zone_id),
+		ZoneName(zone_id) ? ZoneName(zone_id) : "Unknown",
 		zone_id,
 		instance_id,
 		dest_x,