pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 22:58:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix-up after 'io_work' branch merger

Browse Source
This commit is contained in:
Uleat
2019-09-10 00:20:13 -04:00
parent 7911225960
commit 28d5c8f301
2 changed files with 1 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/zonedb.cpp
+1 -9
View File
@@ -4122,15 +4122,7 @@ bool ZoneDatabase::LoadFactionData()
Log(Logs::General, Logs::Status, "%u Faction%s loaded...", faction_ids.size(), (faction_ids.size() == 1 ? "" : "s"));
// this can be removed once the 'io_work' branch has been merged
std::vector<std::string> faction_id_strings;
for (auto id : faction_ids) {
faction_id_strings.push_back(fmt::format("'{}'", id));
}
const std::string faction_id_criteria(implode(",", faction_id_strings));
// code to activate (note above)
//const std::string faction_id_criteria(implode(",", std::pair<char, char>('\'', '\''), faction_ids));
const std::string faction_id_criteria(implode(",", std::pair<char, char>('\'', '\''), faction_ids));
// load faction mins/maxes
query = fmt::format("SELECT `client_faction_id`, `min`, `max` FROM `faction_base_data` WHERE `client_faction_id` IN ({})", faction_id_criteria);