pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-16 05:11:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Bug Fix] Fix null pointer crash on zones that have not booted a zone yet with #reload commands or anything that calls GetZoneDescription (#2231)

Browse Source
This commit is contained in:
Chris Miles 2022-05-31 20:55:00 -05:00 committed by GitHub
parent 162d34e1d9
commit 291aaea581
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
zone/zone.cpp
View File

@ -60,6 +60,7 @@
#include "../common/repositories/criteria/content_filter_criteria.h" #include "../common/repositories/criteria/content_filter_criteria.h"
#include "../common/repositories/content_flags_repository.h" #include "../common/repositories/content_flags_repository.h"
#include "../common/repositories/zone_points_repository.h" #include "../common/repositories/zone_points_repository.h"
#include "../common/serverinfo.h"
#include <time.h> #include <time.h>
#include <ctime> #include <ctime>
@ -723,7 +724,7 @@ void Zone::GetMerchantDataForZoneLoad() {
if (found) { if (found) {
continue; continue;
} }
mle.slot = std::stoul(row[1]); mle.slot = std::stoul(row[1]);
mle.item = std::stoul(row[2]); mle.item = std::stoul(row[2]);
mle.faction_required = static_cast<int16>(std::stoi(row[3])); mle.faction_required = static_cast<int16>(std::stoi(row[3]));
@ -2734,6 +2735,14 @@ uint32 Zone::GetCurrencyItemID(uint32 currency_id)
std::string Zone::GetZoneDescription() std::string Zone::GetZoneDescription()
{ {
if (!IsLoaded()) {
return fmt::format(
"{} PID ({})",
IsStaticZone() ? "Static" : "Dynamic",
EQ::GetPID()
);
}
auto d = fmt::format( auto d = fmt::format(
"{} ({}){}{}", "{} ({}){}{}",
GetLongName(), GetLongName(),