From 930079959cc924e227a5214ab1889936967b521b Mon Sep 17 00:00:00 2001 From: Kinglykrab Date: Mon, 6 Sep 2021 20:37:34 -0400 Subject: [PATCH] [Bug Fix] Resolves issue where loading temporary merchant list "fails" because there aren't any to load. --- zone/zone.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/zone/zone.cpp b/zone/zone.cpp index 709803aab..37bcb4db5 100755 --- a/zone/zone.cpp +++ b/zone/zone.cpp @@ -534,6 +534,10 @@ void Zone::LoadTempMerchantData() ) ); + if (!results.Success() || results.RowCount() == 0) { + return; + } + std::vector npc_ids; for (auto row = results.begin(); row != results.end(); ++row) { npc_ids.push_back(row[0]);