pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 14:41:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Fix] Bazaar Search window not working in a DZ (#4828)

Browse Source
This commit is contained in:
Mitch Freeman 2025-04-09 23:33:48 -03:00 committed by GitHub
parent b813cf71bb
commit 216b3a039f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
common/repositories/trader_repository.h
View File

@ -54,17 +54,31 @@ public:
{ {
BulkTraders_Struct all_entries{}; BulkTraders_Struct all_entries{};
std::vector<DistinctTraders_Struct> distinct_traders; std::vector<DistinctTraders_Struct> distinct_traders;
MySQLRequestResult results;
auto results = db.QueryDatabase(fmt::format( if (RuleB(Bazaar, UseAlternateBazaarSearch)) {
"SELECT DISTINCT(t.char_id), t.char_zone_id, t.char_zone_instance_id, t.char_entity_id, c.name " results = db.QueryDatabase(fmt::format(
"FROM trader AS t " "SELECT DISTINCT(t.char_id), t.char_zone_id, t.char_zone_instance_id, t.char_entity_id, c.name "
"JOIN character_data AS c ON t.char_id = c.id " "FROM trader AS t "
"WHERE t.char_zone_instance_id = {} " "JOIN character_data AS c ON t.char_id = c.id "
"ORDER BY t.char_zone_instance_id ASC " "WHERE t.char_zone_instance_id = {} "
"LIMIT {}", "ORDER BY t.char_zone_instance_id ASC "
char_zone_instance_id, "LIMIT {}",
max_results) char_zone_instance_id,
); max_results)
);
}
else {
results = db.QueryDatabase(fmt::format(
"SELECT DISTINCT(t.char_id), t.char_zone_id, t.char_zone_instance_id, t.char_entity_id, c.name "
"FROM trader AS t "
"JOIN character_data AS c ON t.char_id = c.id "
"ORDER BY t.char_zone_instance_id ASC "
"LIMIT {}",
char_zone_instance_id,
max_results)
);
}
distinct_traders.reserve(results.RowCount()); distinct_traders.reserve(results.RowCount());

2
zone/trading.cpp
View File

@ -2739,8 +2739,6 @@ void Client::SendBulkBazaarTraders()
SetTraderCount(results.count); SetTraderCount(results.count);
SetTraderCount(results.count);
auto p_size = 4 + 12 * results.count + results.name_length; auto p_size = 4 + 12 * results.count + results.name_length;
auto buffer = std::make_unique<char[]>(p_size); auto buffer = std::make_unique<char[]>(p_size);
memset(buffer.get(), 0, p_size); memset(buffer.get(), 0, p_size);