From b05f1d321859bd7987af895e25cdd8ca9b03e98b Mon Sep 17 00:00:00 2001 From: Alex King <89047260+Kinglykrab@users.noreply.github.com> Date: Tue, 27 Jun 2023 16:23:48 -0400 Subject: [PATCH] [Bug Fix] Merchant Open Flag set only for regular Merchants (#3454) * [Bug Fix] Merchant Open Flag set only for regular Merchants * Update npc.cpp --- zone/npc.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/zone/npc.cpp b/zone/npc.cpp index 76f711c49..5b3061d0b 100644 --- a/zone/npc.cpp +++ b/zone/npc.cpp @@ -243,7 +243,14 @@ NPC::NPC(const NPCType *npc_type_data, Spawn2 *in_respawn, const glm::vec4 &posi SetMana(GetMaxMana()); MerchantType = npc_type_data->merchanttype; - merchant_open = GetClass() == MERCHANT; + merchant_open = ( + GetClass() == MERCHANT || + GetClass() == DISCORD_MERCHANT || + GetClass() == ADVENTURE_MERCHANT || + GetClass() == NORRATHS_KEEPERS_MERCHANT || + GetClass() == DARK_REIGN_MERCHANT || + GetClass() == ALT_CURRENCY_MERCHANT + ); adventure_template_id = npc_type_data->adventure_template; flymode = iflymode;