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

Fix Merge issues

Browse Source
This commit is contained in:
Mitch Freeman 2025-05-04 19:00:45 -03:00
parent 3617b24e10
commit b38d30e8ff
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/repositories/trader_repository.h
View File

@ -399,9 +399,9 @@ public:
static Trader GetAccountZoneIdAndInstanceIdByAccountId(Database &db, uint32 account_id) static Trader GetAccountZoneIdAndInstanceIdByAccountId(Database &db, uint32 account_id)
{ {
auto trader_query = fmt::format( 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 " "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;", "LIMIT 1;",
account_id account_id
); );
@ -432,7 +432,7 @@ public:
} }
e.id = row[0] ? strtoull(row[0], nullptr, 10) : 0; e.id = row[0] ? strtoull(row[0], nullptr, 10) : 0;
e.char_id = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0; e.character_id = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
e.char_zone_id = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0; e.char_zone_id = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
e.char_zone_instance_id = row[3] ? static_cast<int32_t>(atoi(row[3])) : 0; e.char_zone_instance_id = row[3] ? static_cast<int32_t>(atoi(row[3])) : 0;

1
common/servertalk.h
View File

@ -1799,6 +1799,7 @@ struct BazaarPurchaseMessaging_Struct {
uint32 buyer_zone_id; uint32 buyer_zone_id;
uint32 buyer_zone_instance_id; uint32 buyer_zone_instance_id;
uint32 transaction_status; uint32 transaction_status;
bool offline_purchase;
}; };

2
world/login_server.cpp
View File

@ -790,7 +790,7 @@ void LoginServer::ProcessUserToWorldCancelOfflineRequest(uint16_t opcode, EQ::Ne
AccountRepository::SetOfflineStatus(database, id, false); AccountRepository::SetOfflineStatus(database, id, false);
LogLoginserverDetail("Step 5b(3) - World clearing trader and buyer tablese."); 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); BuyerRepository::DeleteBuyer(database, trader.id);
server_packet.opcode = ServerOP_UsertoWorldCancelOfflineResponse; server_packet.opcode = ServerOP_UsertoWorldCancelOfflineResponse;