From b38d30e8ffe3d04370198a0ce53278de86397ea4 Mon Sep 17 00:00:00 2001 From: Mitch Freeman <65987027+neckkola@users.noreply.github.com> Date: Sun, 4 May 2025 19:00:45 -0300 Subject: [PATCH] Fix Merge issues --- common/repositories/trader_repository.h | 6 +++--- common/servertalk.h | 1 + world/login_server.cpp | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/common/repositories/trader_repository.h b/common/repositories/trader_repository.h index 5afb76c33..783166eb4 100644 --- a/common/repositories/trader_repository.h +++ b/common/repositories/trader_repository.h @@ -399,9 +399,9 @@ public: static Trader GetAccountZoneIdAndInstanceIdByAccountId(Database &db, uint32 account_id) { auto trader_query = fmt::format( - "SELECT t.id, t.char_id, t.char_zone_id, t.char_zone_instance_id " + "SELECT t.id, t.character_id, t.char_zone_id, t.char_zone_instance_id " "FROM trader AS t " - "WHERE t.char_id IN(SELECT c.id FROM character_data AS c WHERE c.account_id = '{}') " + "WHERE t.character_id IN(SELECT c.id FROM character_data AS c WHERE c.account_id = '{}') " "LIMIT 1;", account_id ); @@ -432,7 +432,7 @@ public: } e.id = row[0] ? strtoull(row[0], nullptr, 10) : 0; - e.char_id = row[1] ? static_cast(strtoul(row[1], nullptr, 10)) : 0; + e.character_id = row[1] ? static_cast(strtoul(row[1], nullptr, 10)) : 0; e.char_zone_id = row[2] ? static_cast(strtoul(row[2], nullptr, 10)) : 0; e.char_zone_instance_id = row[3] ? static_cast(atoi(row[3])) : 0; diff --git a/common/servertalk.h b/common/servertalk.h index 791434305..0e3beffc2 100644 --- a/common/servertalk.h +++ b/common/servertalk.h @@ -1799,6 +1799,7 @@ struct BazaarPurchaseMessaging_Struct { uint32 buyer_zone_id; uint32 buyer_zone_instance_id; uint32 transaction_status; + bool offline_purchase; }; diff --git a/world/login_server.cpp b/world/login_server.cpp index 00aaa0a6e..5d94394b2 100644 --- a/world/login_server.cpp +++ b/world/login_server.cpp @@ -790,7 +790,7 @@ void LoginServer::ProcessUserToWorldCancelOfflineRequest(uint16_t opcode, EQ::Ne AccountRepository::SetOfflineStatus(database, id, false); LogLoginserverDetail("Step 5b(3) - World clearing trader and buyer tablese."); - TraderRepository::DeleteWhere(database, fmt::format("`char_id` = '{}'", trader.id)); + TraderRepository::DeleteWhere(database, fmt::format("`character_id` = '{}'", trader.id)); BuyerRepository::DeleteBuyer(database, trader.id); server_packet.opcode = ServerOP_UsertoWorldCancelOfflineResponse;