From 29701d0ea71e582158afb711d6825fbd01b1d779 Mon Sep 17 00:00:00 2001
From: Mitch Freeman <65987027+neckkola@users.noreply.github.com>
Date: Sat, 1 Feb 2025 15:36:26 -0400
Subject: [PATCH] [Fix] Update the shard bazaar search feature (#4630)

---
 common/bazaar.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/common/bazaar.cpp b/common/bazaar.cpp
index 5a8950e16..0b8efef17 100644
--- a/common/bazaar.cpp
+++ b/common/bazaar.cpp
@@ -312,9 +312,12 @@ Bazaar::GetSearchResults(
 		r.item_stat               = item_results.at(t.trader.item_id).stats;
 
 		if (RuleB(Bazaar, UseAlternateBazaarSearch)) {
-			if (convert || (r.trader_zone_id == Zones::BAZAAR && r.trader_zone_instance_id != char_zone_instance_id)) {
+			if (convert ||
+				char_zone_id != Zones::BAZAAR ||
+				(char_zone_id == Zones::BAZAAR && r.trader_zone_instance_id != char_zone_instance_id)
+				) {
 				r.trader_id = TraderRepository::TRADER_CONVERT_ID + r.trader_zone_instance_id;
-			}
+				}
 		}
 
 		all_entries.push_back(r);