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

[Bug Fix] Fix empty spawned merchants (#2275)

Browse Source 
Regression from 763fc823
This commit is contained in:
hg 2022-06-28 09:23:08 -04:00 committed by GitHub
parent 28b07d635a
commit 16b31c5a3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zone/client_process.cpp
View File

@ -823,10 +823,10 @@ void Client::BulkSendMerchantInventory(int merchant_id, int npcid) {
const EQ::ItemData *item = nullptr; const EQ::ItemData *item = nullptr;
auto merchant_list = zone->merchanttable[merchant_id]; auto merchant_list = zone->merchanttable[merchant_id];
auto npc = entity_list.GetMobByNpcTypeID(npcid); auto npc = entity_list.GetMobByNpcTypeID(npcid);
if (!merchant_list.size() == 0) { if (merchant_list.empty()) {
zone->LoadNewMerchantData(merchant_id); zone->LoadNewMerchantData(merchant_id);
merchant_list = zone->merchanttable[merchant_id]; merchant_list = zone->merchanttable[merchant_id];
if (!merchant_list.size()) { if (merchant_list.empty()) {
return; return;
} }
} }