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

Rebase

Browse Source 
Rebase updates
This commit is contained in:
Mitch Freeman 2025-07-01 22:16:28 -03:00
parent a0f701686b
commit addc1a865d
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
world/login_server.cpp
View File

@ -131,7 +131,7 @@ void LoginServer::ProcessUsertoWorldReq(uint16_t opcode, EQ::Net::Packet &p)
UsertoWorldRequest *utwr = (UsertoWorldRequest *) p.Data();
uint32 id = database.GetAccountIDFromLSID(utwr->login, utwr->lsaccountid);
auto status_record = database.GetAccountStatus(id);
auto client = client_list.FindCLEByAccountID(id);
auto client = ClientList::Instance()->FindCLEByAccountID(id);
if (client) {
client->SetOfflineMode(status_record.offline);
@ -772,7 +772,7 @@ void LoginServer::ProcessUserToWorldCancelOfflineRequest(uint16_t opcode, EQ::Ne
auto trader = TraderRepository::GetAccountZoneIdAndInstanceIdByAccountId(database, id);
if (trader.id &&
zoneserver_list.IsZoneBootedByZoneIdAndInstanceId(trader.char_zone_id, trader.char_zone_instance_id)) {
ZSList::Instance()->IsZoneBootedByZoneIdAndInstanceId(trader.char_zone_id, trader.char_zone_instance_id)) {
LogLoginserverDetail(
"Step 5a(1) - World Checked offline users zone/instance is booted. "
"Sending packet to zone id {} instance id {}",
@ -780,7 +780,7 @@ void LoginServer::ProcessUserToWorldCancelOfflineRequest(uint16_t opcode, EQ::Ne
trader.char_zone_instance_id);
server_packet.opcode = ServerOP_UsertoWorldCancelOfflineRequest;
zoneserver_list.SendPacketToBootedZones(&server_packet);
ZSList::Instance()->SendPacketToBootedZones(&server_packet);
return;
}

6
world/zoneserver.cpp
View File

@ -1677,12 +1677,12 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
auto in = reinterpret_cast<BazaarPurchaseMessaging_Struct *>(pack->pBuffer);
switch (in->transaction_status) {
case BazaarPurchaseBuyerCompleteSendToSeller: {
zoneserver_list.SendPacket(in->trader_zone_id, in->trader_zone_instance_id, pack);
ZSList::Instance()->SendPacket(in->trader_zone_id, in->trader_zone_instance_id, pack);
break;
}
case BazaarPurchaseTraderFailed:
case BazaarPurchaseSuccess: {
zoneserver_list.SendPacket(in->buyer_zone_id, in->buyer_zone_instance_id, pack);
ZSList::Instance()->SendPacket(in->buyer_zone_id, in->buyer_zone_instance_id, pack);
break;
}
default: {
@ -1752,7 +1752,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
"Step 7a - World received ServerOP_UsertoWorldCancelOfflineResponse back to login with success."
);
loginserverlist.SendPacket(&server_packet);
LoginServerList::Instance()->SendPacket(&server_packet);
break;
}
default: {

4
zone/worldserver.cpp
View File

@ -3946,7 +3946,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
uint64 total_cost =
static_cast<uint64>(in->trader_buy_struct.price) * static_cast<uint64>(in->item_quantity);
if (player_event_logs.IsEventEnabled(PlayerEvent::TRADER_PURCHASE)) {
if (PlayerEventLogs::Instance()->IsEventEnabled(PlayerEvent::TRADER_PURCHASE)) {
auto e = PlayerEvent::TraderPurchaseEvent{
.item_id = in->trader_buy_struct.item_id,
.augment_1_id = in->item_aug_1,
@ -3994,7 +3994,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
CharacterParcelsRepository::InsertOne(database, parcel_out);
if (player_event_logs.IsEventEnabled(PlayerEvent::PARCEL_SEND)) {
if (PlayerEventLogs::Instance()->IsEventEnabled(PlayerEvent::PARCEL_SEND)) {
PlayerEvent::ParcelSend e{};
e.from_player_name = parcel_out.from_name;
e.to_player_name = buyer->GetCleanName();