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

[Hot Fix] Off by on in Merchant Loading. (#2166)

Browse Source
This commit is contained in:
Kinglykrab 2022-05-10 18:25:32 -04:00 committed by GitHub
parent d120cf8a40
commit f314e05087
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
zone/zone.cpp
View File

@ -700,7 +700,7 @@ void Zone::GetMerchantDataForZoneLoad() {
for (auto row : results) { for (auto row : results) {
MerchantList mle{}; MerchantList mle{};
mle.id = atoul(row[0]); mle.id = std::stoul(row[0]);
if (npc_id != mle.id) { if (npc_id != mle.id) {
merchant_list = merchanttable.find(mle.id); merchant_list = merchanttable.find(mle.id);
if (merchant_list == merchanttable.end()) { if (merchant_list == merchanttable.end()) {
@ -724,16 +724,16 @@ void Zone::GetMerchantDataForZoneLoad() {
continue; continue;
} }
mle.slot = std::stoul(row[0]); mle.slot = std::stoul(row[1]);
mle.item = std::stoul(row[1]); mle.item = std::stoul(row[2]);
mle.faction_required = static_cast<int16>(std::stoi(row[2])); mle.faction_required = static_cast<int16>(std::stoi(row[3]));
mle.level_required = static_cast<uint8>(std::stoul(row[3])); mle.level_required = static_cast<uint8>(std::stoul(row[4]));
mle.alt_currency_cost = static_cast<uint16>(std::stoul(row[4])); mle.alt_currency_cost = static_cast<uint16>(std::stoul(row[5]));
mle.classes_required = std::stoul(row[5]); mle.classes_required = std::stoul(row[6]);
mle.probability = static_cast<uint8>(std::stoul(row[6])); mle.probability = static_cast<uint8>(std::stoul(row[7]));
mle.bucket_name = row[7]; mle.bucket_name = row[8];
mle.bucket_value = row[8]; mle.bucket_value = row[9];
mle.bucket_comparison = static_cast<uint8>(std::stoul(row[9])); mle.bucket_comparison = static_cast<uint8>(std::stoul(row[10]));
merchant_list->second.push_back(mle); merchant_list->second.push_back(mle);
} }