From e6a3d5e1c5f18d525cd62347176911e63be904e9 Mon Sep 17 00:00:00 2001 From: catapultam-habeo <97849758+catapultam-habeo@users.noreply.github.com> Date: Tue, 5 Mar 2024 17:21:04 -0600 Subject: [PATCH] [Bug Fix] Prevent NPE when creating DZ using ad-hoc version IDs (#4141) * initial commit * corrected based on hgtw feedback --- zone/task_client_state.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zone/task_client_state.cpp b/zone/task_client_state.cpp index 7d3878730..1f4d8ef07 100644 --- a/zone/task_client_state.cpp +++ b/zone/task_client_state.cpp @@ -2290,8 +2290,8 @@ void ClientTaskState::CreateTaskDynamicZone(Client* client, int task_id, Dynamic } // dz should be named the version-based zone name (used in choose zone window and dz window on live) - auto zone_info = zone_store.GetZone(dz_request.GetZoneID(), dz_request.GetZoneVersion()); - dz_request.SetName(zone_info->long_name.empty() ? task->title : zone_info->long_name); + auto zone_info = zone_store.GetZoneWithFallback(dz_request.GetZoneID(), dz_request.GetZoneVersion()); + dz_request.SetName(zone_info && !zone_info->long_name.empty() ? zone_info->long_name : task->title); dz_request.SetMinPlayers(task->min_players); dz_request.SetMaxPlayers(task->max_players);