pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-31 17:26:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Code] ZSList Global to Singleton Cleanup (#4940)

Browse Source 
* [Code] ZSList Global to Singleton Cleanup

* Final

* Post merge fixes

---------

Co-authored-by: Chris Miles <akkadius1@gmail.com>
This commit is contained in:
Alex King
2025-06-25 16:16:44 -04:00
committed by GitHub
parent 643ee56433
commit dc261bb203
24 changed files with 266 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files
world/zoneserver.cpp
+91 -92
View File
@@ -54,7 +54,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
extern ClientList client_list;
extern GroupLFPList LFPGroupList;
extern ZSList zoneserver_list;
extern volatile bool RunLoops;
extern volatile bool UCSServerAvailable_;
@@ -69,7 +68,7 @@ ZoneServer::ZoneServer(std::shared_ptr<EQ::Net::ServertalkServerConnection> in_c
memset(client_address, 0, sizeof(client_address));
memset(client_local_address, 0, sizeof(client_local_address));
zone_server_id = zoneserver_list.GetNextID();
zone_server_id = ZSList::Instance()->GetNextID();
zone_server_zone_id = 0;
instance_id = 0;
zone_os_process_id = 0;
@@ -242,7 +241,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
break;
}
zoneserver_list.SendPacket(pack);
ZSList::Instance()->SendPacket(pack);
break;
}
case ServerOP_GroupJoin: {
@@ -250,7 +249,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
break;
}
zoneserver_list.SendPacket(pack);
ZSList::Instance()->SendPacket(pack);
break;
}
case ServerOP_ForceGroupUpdate: {
@@ -258,7 +257,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
break;
}
zoneserver_list.SendPacket(pack);
ZSList::Instance()->SendPacket(pack);
break;
}
case ServerOP_DisbandGroup: {
@@ -266,7 +265,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
break;
}
zoneserver_list.SendPacket(pack);
ZSList::Instance()->SendPacket(pack);
break;
}
case ServerOP_RaidAdd: {
@@ -274,7 +273,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
break;
}
zoneserver_list.SendPacket(pack);
ZSList::Instance()->SendPacket(pack);
break;
}
case ServerOP_RaidRemove: {
@@ -282,7 +281,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
break;
}
zoneserver_list.SendPacket(pack);
ZSList::Instance()->SendPacket(pack);
break;
}
case ServerOP_RaidDisband: {
@@ -290,7 +289,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
break;
}
zoneserver_list.SendPacket(pack);
ZSList::Instance()->SendPacket(pack);
break;
}
case ServerOP_RaidLockFlag: {
@@ -298,7 +297,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
break;
}
zoneserver_list.SendPacket(pack);
ZSList::Instance()->SendPacket(pack);
break;
}
case ServerOP_RaidChangeGroup: {
@@ -306,7 +305,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
break;
}
zoneserver_list.SendPacket(pack);
ZSList::Instance()->SendPacket(pack);
break;
}
case ServerOP_UpdateGroup: {
@@ -314,7 +313,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
break;
}
zoneserver_list.SendPacket(pack);
ZSList::Instance()->SendPacket(pack);
break;
}
case ServerOP_RaidGroupDisband: {
@@ -322,7 +321,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
break;
}
zoneserver_list.SendPacket(pack);
ZSList::Instance()->SendPacket(pack);
break;
}
case ServerOP_RaidGroupAdd: {
@@ -330,7 +329,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
break;
}
zoneserver_list.SendPacket(pack);
ZSList::Instance()->SendPacket(pack);
break;
}
case ServerOP_RaidGroupRemove: {
@@ -338,7 +337,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
break;
}
zoneserver_list.SendPacket(pack);
ZSList::Instance()->SendPacket(pack);
break;
}
case ServerOP_RaidGroupLeader: {
@@ -346,7 +345,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
break;
}
zoneserver_list.SendPacket(pack);
ZSList::Instance()->SendPacket(pack);
break;
}
case ServerOP_RaidLeader: {
@@ -354,7 +353,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
break;
}
zoneserver_list.SendPacket(pack);
ZSList::Instance()->SendPacket(pack);
break;
}
case ServerOP_PlayerEvent: {
@@ -386,7 +385,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
break;
}
zoneserver_list.SendPacket(pack);
ZSList::Instance()->SendPacket(pack);
break;
}
case ServerOP_RaidMOTD: {
@@ -394,7 +393,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
break;
}
zoneserver_list.SendPacket(pack);
ZSList::Instance()->SendPacket(pack);
break;
}
case ServerOP_RaidNote: {
@@ -402,7 +401,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
break;
}
zoneserver_list.SendPacket(pack);
ZSList::Instance()->SendPacket(pack);
break;
}
case ServerOP_SpawnCondition: {
@@ -411,7 +410,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
}
auto ssc = (ServerSpawnCondition_Struct*) pack->pBuffer;
zoneserver_list.SendPacket(ssc->zoneID, ssc->instanceID, pack);
ZSList::Instance()->SendPacket(ssc->zoneID, ssc->instanceID, pack);
break;
}
case ServerOP_SpawnEvent: {
@@ -420,7 +419,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
}
auto sse = (ServerSpawnEvent_Struct*) pack->pBuffer;
zoneserver_list.SendPacket(sse->zoneID, 0, pack);
ZSList::Instance()->SendPacket(sse->zoneID, 0, pack);
break;
}
case ServerOP_ChannelMessage: {
@@ -456,7 +455,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
) &&
!scm->noreply
) {
zoneserver_list.SendEmoteMessage(
ZSList::Instance()->SendEmoteMessage(
scm->from,
0,
AccountStatus::Player,
@@ -530,7 +529,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
}
} else if (!cle->Server()) {
if (!scm->noreply)
zoneserver_list.SendEmoteMessage(
ZSList::Instance()->SendEmoteMessage(
scm->from,
0,
AccountStatus::Player,
@@ -568,11 +567,11 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
}
}
if (scm->guilddbid > 0) {
zoneserver_list.SendPacketToZonesWithGuild(scm->guilddbid, pack);
ZSList::Instance()->SendPacketToZonesWithGuild(scm->guilddbid, pack);
} else if (scm->chan_num == ChatChannel_GMSAY) {
zoneserver_list.SendPacketToZonesWithGMs(pack);
ZSList::Instance()->SendPacketToZonesWithGMs(pack);
} else {
zoneserver_list.SendPacket(pack);
ZSList::Instance()->SendPacket(pack);
}
}
@@ -580,7 +579,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
}
case ServerOP_EmoteMessage: {
auto sem = (ServerEmoteMessage_Struct*) pack->pBuffer;
zoneserver_list.SendEmoteMessageRaw(
ZSList::Instance()->SendEmoteMessageRaw(
sem->to,
sem->guilddbid,
sem->minstatus,
@@ -598,7 +597,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
cle->Online() < CLE_Status::Zoning ||
!cle->Server()
) {
zoneserver_list.SendEmoteMessage(
ZSList::Instance()->SendEmoteMessage(
svm->From,
0,
AccountStatus::Player,
@@ -612,14 +611,14 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
}
cle->Server()->SendPacket(pack);
} else {
zoneserver_list.SendPacket(pack);
ZSList::Instance()->SendPacket(pack);
}
break;
}
case ServerOP_RezzPlayer: {
auto rps = (RezzPlayer_Struct*) pack->pBuffer;
if (zoneserver_list.SendPacket(pack)) {
if (ZSList::Instance()->SendPacket(pack)) {
LogInfo("Sent Rez packet for [{}]", rps->rez.your_name);
} else {
LogInfo("Could not send Rez packet for [{}]", rps->rez.your_name);
@@ -663,7 +662,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
auto sci = (ServerConnectInfo*) pack->pBuffer;
if (!sci->port) {
client_port = zoneserver_list.GetAvailableZonePort();
client_port = ZSList::Instance()->GetAvailableZonePort();
ServerPacket p(ServerOP_SetConnectInfo, sizeof(ServerConnectInfo));
memset(p.pBuffer, 0, sizeof(ServerConnectInfo));
@@ -705,20 +704,20 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
}
case ServerOP_ShutdownAll: {
if (!pack->size) {
zoneserver_list.SendPacket(pack);
zoneserver_list.Process();
ZSList::Instance()->SendPacket(pack);
ZSList::Instance()->Process();
CatchSignal(2);
} else {
auto wsd = (WorldShutDown_Struct*) pack->pBuffer;
if (!wsd->time && !wsd->interval && zoneserver_list.shutdowntimer->Enabled()) {
zoneserver_list.shutdowntimer->Disable();
zoneserver_list.reminder->Disable();
if (!wsd->time && !wsd->interval && ZSList::Instance()->shutdowntimer->Enabled()) {
ZSList::Instance()->shutdowntimer->Disable();
ZSList::Instance()->reminder->Disable();
} else {
zoneserver_list.shutdowntimer->SetTimer(wsd->time);
zoneserver_list.reminder->SetTimer(wsd->interval - 1000);
zoneserver_list.reminder->SetAtTrigger(wsd->interval);
zoneserver_list.shutdowntimer->Start();
zoneserver_list.reminder->Start();
ZSList::Instance()->shutdowntimer->SetTimer(wsd->time);
ZSList::Instance()->reminder->SetTimer(wsd->interval - 1000);
ZSList::Instance()->reminder->SetAtTrigger(wsd->interval);
ZSList::Instance()->shutdowntimer->Start();
ZSList::Instance()->reminder->Start();
}
}
@@ -728,13 +727,13 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
auto *s = (ServerZoneStateChange_Struct*) pack->pBuffer;
ZoneServer* zs = 0;
if (s->zone_server_id) {
zs = zoneserver_list.FindByID(s->zone_server_id);
zs = ZSList::Instance()->FindByID(s->zone_server_id);
} else if (s->zone_id) {
zs = zoneserver_list.FindByName(ZoneName(s->zone_id));
zs = ZSList::Instance()->FindByName(ZoneName(s->zone_id));
} else if (s->instance_id) {
zs = zoneserver_list.FindByInstanceID(s->instance_id);
zs = ZSList::Instance()->FindByInstanceID(s->instance_id);
} else {
zoneserver_list.SendEmoteMessage(
ZSList::Instance()->SendEmoteMessage(
s->admin_name,
0,
AccountStatus::Player,
@@ -744,7 +743,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
}
if (!zs) {
zoneserver_list.SendEmoteMessage(
ZSList::Instance()->SendEmoteMessage(
s->admin_name,
0,
AccountStatus::Player,
@@ -759,13 +758,13 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
}
case ServerOP_ZoneBootup: {
auto *s = (ServerZoneStateChange_Struct*) pack->pBuffer;
zoneserver_list.SOPZoneBootup(s->admin_name, s->zone_server_id, ZoneName(s->zone_id), s->is_static);
ZSList::Instance()->SOPZoneBootup(s->admin_name, s->zone_server_id, ZoneName(s->zone_id), s->is_static);
break;
}
case ServerOP_ZoneStatus: {
if (pack->size >= 1) {
auto z = (ServerZoneStatus_Struct*) pack->pBuffer;
zoneserver_list.SendZoneStatus(z->name, z->admin, this);
ZSList::Instance()->SendZoneStatus(z->name, z->admin, this);
}
break;
@@ -829,7 +828,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
if (
ztz->admin < AccountStatus::QuestTroupe &&
ztz->ignorerestrictions < 2 &&
zoneserver_list.IsZoneLocked(ztz->requested_zone_id)
ZSList::Instance()->IsZoneLocked(ztz->requested_zone_id)
) {
ztz->response = 0;
@@ -846,8 +845,8 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
auto ingress_server = (
ztz->requested_instance_id ?
zoneserver_list.FindByInstanceID(ztz->requested_instance_id) :
zoneserver_list.FindByZoneID(ztz->requested_zone_id)
ZSList::Instance()->FindByInstanceID(ztz->requested_instance_id) :
ZSList::Instance()->FindByZoneID(ztz->requested_zone_id)
);
if (ingress_server) {
@@ -861,7 +860,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
ztz->response = 1;
} else {
int server_id;
if ((server_id = zoneserver_list.TriggerBootup(ztz->requested_zone_id, ztz->requested_instance_id))) {
if ((server_id = ZSList::Instance()->TriggerBootup(ztz->requested_zone_id, ztz->requested_instance_id))) {
LogZoning(
"ZoneToZone successfully booted a zone for character [{}] zone [{}] ({}) instance [{}] ({})",
ztz->name,
@@ -871,7 +870,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
server_id
);
ztz->response = 1;
ingress_server = zoneserver_list.FindByID(server_id);
ingress_server = ZSList::Instance()->FindByID(server_id);
} else {
LogError("failed to boot a zone for [{}]", ztz->name);
ztz->response = 0;
@@ -895,8 +894,8 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
);
auto egress_server = (
ztz->current_instance_id ?
zoneserver_list.FindByInstanceID(ztz->current_instance_id) :
zoneserver_list.FindByZoneID(ztz->current_zone_id)
ZSList::Instance()->FindByInstanceID(ztz->current_instance_id) :
ZSList::Instance()->FindByZoneID(ztz->current_zone_id)
);
if (egress_server) {
@@ -1006,7 +1005,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
cle->SetAdmin(*((int16*)&pack->pBuffer[4]));
}
zoneserver_list.SendPacket(pack);
ZSList::Instance()->SendPacket(pack);
break;
}
case ServerOP_GMGoto: {
@@ -1106,7 +1105,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
auto smotd = (ServerMotd_Struct*) pack->pBuffer;
RuleManager::Instance()->SetRule("MOTD", smotd->motd, &database, true, true);
zoneserver_list.SendPacket(pack);
ZSList::Instance()->SendPacket(pack);
break;
}
case ServerOP_Uptime: {
@@ -1119,7 +1118,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
if (!sus->zoneserverid) {
ZSList::ShowUpTime(this, sus->adminname);
} else {
auto zs = zoneserver_list.FindByID(sus->zoneserverid);
auto zs = ZSList::Instance()->FindByID(sus->zoneserverid);
if (zs) {
zs->SendPacket(pack);
}
@@ -1136,8 +1135,8 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
pack->pBuffer = new uchar[pack->size];
memset(pack->pBuffer, 0, pack->size);
auto tod = (eqTimeOfDay*) pack->pBuffer;
tod->start_eqtime = zoneserver_list.worldclock.getStartEQTime();
tod->start_realtime = zoneserver_list.worldclock.getStartRealTime();
tod->start_eqtime = ZSList::Instance()->worldclock.getStartEQTime();
tod->start_realtime = ZSList::Instance()->worldclock.getStartRealTime();
SendPacket(pack);
safe_delete(pack);
break;
@@ -1145,10 +1144,10 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
case ServerOP_SetWorldTime: {
LogNetcode("Received SetWorldTime");
auto newtime = (eqTimeOfDay*) pack->pBuffer;
zoneserver_list.worldclock.SetCurrentEQTimeOfDay(newtime->start_eqtime, newtime->start_realtime);
ZSList::Instance()->worldclock.SetCurrentEQTimeOfDay(newtime->start_eqtime, newtime->start_realtime);
LogInfo("New time = [{}]-[{}]-[{}] [{}]:[{}] ([{}])\n", newtime->start_eqtime.year, newtime->start_eqtime.month, (int)newtime->start_eqtime.day, (int)newtime->start_eqtime.hour, (int)newtime->start_eqtime.minute, (int)newtime->start_realtime);
database.SaveTime((int)newtime->start_eqtime.minute, (int)newtime->start_eqtime.hour, (int)newtime->start_eqtime.day, newtime->start_eqtime.month, newtime->start_eqtime.year);
zoneserver_list.SendTimeSync();
ZSList::Instance()->SendTimeSync();
break;
}
case ServerOP_IPLookup: {
@@ -1174,14 +1173,14 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
auto lock_zone = (ServerLockZone_Struct*) pack->pBuffer;
if (lock_zone->op == ServerLockType::List) {
zoneserver_list.ListLockedZones(lock_zone->adminname, this);
ZSList::Instance()->ListLockedZones(lock_zone->adminname, this);
break;
} else if (
lock_zone->op == ServerLockType::Lock ||
lock_zone->op == ServerLockType::Unlock
) {
if (zoneserver_list.SetLockedZone(lock_zone->zoneID, lock_zone->op == ServerLockType::Lock)) {
zoneserver_list.SendEmoteMessage(
if (ZSList::Instance()->SetLockedZone(lock_zone->zoneID, lock_zone->op == ServerLockType::Lock)) {
ZSList::Instance()->SendEmoteMessage(
0,
0,
AccountStatus::QuestTroupe,
@@ -1225,7 +1224,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
}
case ServerOP_SpawnPlayerCorpse: {
auto s = (SpawnPlayerCorpse_Struct*) pack->pBuffer;
auto zs = zoneserver_list.FindByZoneID(s->zone_id);
auto zs = ZSList::Instance()->FindByZoneID(s->zone_id);
if (zs) {
zs->SendPacket(pack);
}
@@ -1237,8 +1236,8 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
auto owner_zs = (
s->instance_id ?
zoneserver_list.FindByInstanceID(s->instance_id) :
zoneserver_list.FindByZoneID(s->zone_id)
ZSList::Instance()->FindByInstanceID(s->instance_id) :
ZSList::Instance()->FindByZoneID(s->zone_id)
);
if (owner_zs) {
@@ -1252,8 +1251,8 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
if (cle) {
auto granted_zs = (
cle->instance() ?
zoneserver_list.FindByInstanceID(cle->instance()) :
zoneserver_list.FindByZoneID(cle->zone())
ZSList::Instance()->FindByInstanceID(cle->instance()) :
ZSList::Instance()->FindByZoneID(cle->zone())
);
if (granted_zs && granted_zs != owner_zs) {
@@ -1266,7 +1265,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
}
case ServerOP_InstanceUpdateTime: {
auto iut = (ServerInstanceUpdateTime_Struct*) pack->pBuffer;
auto zm = zoneserver_list.FindByInstanceID(iut->instance_id);
auto zm = ZSList::Instance()->FindByInstanceID(iut->instance_id);
if (zm) {
zm->SendPacket(pack);
}
@@ -1278,7 +1277,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
break;
}
zoneserver_list.SendPacket(pack);
ZSList::Instance()->SendPacket(pack);
break;
}
case ServerOP_QGlobalDelete: {
@@ -1286,7 +1285,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
break;
}
zoneserver_list.SendPacket(pack);
ZSList::Instance()->SendPacket(pack);
break;
}
case ServerOP_AdventureRequest: {
@@ -1344,7 +1343,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
}
case ServerOP_UCSServerStatusRequest: {
auto ucsss = (UCSServerStatus_Struct*) pack->pBuffer;
auto zs = zoneserver_list.FindByPort(ucsss->port);
auto zs = ZSList::Instance()->FindByPort(ucsss->port);
if (!zs) {
break;
}
@@ -1398,12 +1397,12 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
case ServerOP_WWSpell:
case ServerOP_WWTaskUpdate:
case ServerOP_ZonePlayer: {
zoneserver_list.SendPacket(pack);
ZSList::Instance()->SendPacket(pack);
break;
}
case ServerOP_ServerReloadRequest: {
auto o = (ServerReload::Request*) pack->pBuffer;
zoneserver_list.SendServerReload((ServerReload::Type) o->type, pack->pBuffer);
ZSList::Instance()->SendServerReload((ServerReload::Type) o->type, pack->pBuffer);
break;
}
case ServerOP_IsOwnerOnline: {
@@ -1425,7 +1424,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
);
}
auto zs = zoneserver_list.FindByZoneID(o->zone_id);
auto zs = ZSList::Instance()->FindByZoneID(o->zone_id);
if (zs) {
zs->SendPacket(pack);
}
@@ -1439,7 +1438,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
LogInfo("Error: Could not load item data. But ignoring");
}
zoneserver_list.SendPacket(pack);
ZSList::Instance()->SendPacket(pack);
break;
}
case ServerOP_RequestTellQueue: {
@@ -1514,7 +1513,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
guild->tribute.timer.Disable();
zoneserver_list.SendPacketToZonesWithGuild(data->guild_id, pack);
ZSList::Instance()->SendPacketToZonesWithGuild(data->guild_id, pack);
}
break;
}
@@ -1557,7 +1556,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
guild_mgr.UpdateDbGuildFavor(data->guild_id, data->favor);
guild_mgr.UpdateDbTributeTimeRemaining(data->guild_id, data->time_remaining);
zoneserver_list.SendPacketToZonesWithGuild(data->guild_id, pack);
ZSList::Instance()->SendPacketToZonesWithGuild(data->guild_id, pack);
}
break;
}
@@ -1591,7 +1590,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
data->time_remaining = in->time_remaining;
strn0cpy(data->player_name, in->player_name, sizeof(data->player_name));
zoneserver_list.SendPacketToZonesWithGuild(in->guild_id, out);
ZSList::Instance()->SendPacketToZonesWithGuild(in->guild_id, out);
safe_delete(out);
}
break;
@@ -1614,7 +1613,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
out->tribute_id_2_tier = guild->tribute.id_2_tier;
out->time_remaining = guild_mgr.GetGuildTributeTimeRemaining(in->guild_id);
zoneserver_list.SendPacketToZonesWithGuild(in->guild_id, sp);
ZSList::Instance()->SendPacketToZonesWithGuild(in->guild_id, sp);
safe_delete(sp);
}
@@ -1634,7 +1633,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
out->tribute_timer = guild_mgr.GetGuildTributeTimeRemaining(in->guild_id);
out->trophy_timer = 0;
zoneserver_list.SendPacketToZonesWithGuild(in->guild_id, sp);
ZSList::Instance()->SendPacketToZonesWithGuild(in->guild_id, sp);
safe_delete(sp);
}
@@ -1658,7 +1657,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
out->member_time = in->member_time;
strn0cpy(out->player_name, in->player_name, sizeof(out->player_name));
zoneserver_list.SendPacketToZonesWithGuild(out->guild_id, sp);
ZSList::Instance()->SendPacketToZonesWithGuild(out->guild_id, sp);
safe_delete(sp)
}
break;
@@ -1672,7 +1671,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
return;
}
zoneserver_list.SendPacketToBootedZones(pack);
ZSList::Instance()->SendPacketToBootedZones(pack);
break;
}
case ServerOP_BazaarPurchase: {
@@ -1688,7 +1687,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
auto trader = client_list.FindCLEByCharacterID(in->trader_buy_struct.trader_id);
if (trader) {
zoneserver_list.SendPacket(trader->zone(), trader->instance(), pack);
ZSList::Instance()->SendPacket(trader->zone(), trader->instance(), pack);
}
break;
@@ -1706,13 +1705,13 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
return;
}
zoneserver_list.SendPacketToBootedZones(pack);
ZSList::Instance()->SendPacketToBootedZones(pack);
break;
}
case Barter_SellItem: {
auto buyer = client_list.FindCharacter(in->buyer_name);
if (buyer) {
zoneserver_list.SendPacket(buyer->zone(), buyer->instance(), pack);
ZSList::Instance()->SendPacket(buyer->zone(), buyer->instance(), pack);
}
break;
@@ -1721,7 +1720,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
case Barter_BuyerTransactionComplete: {
auto seller = client_list.FindCharacter(in->seller_name);
if (seller) {
zoneserver_list.SendPacket(seller->zone(), seller->instance(), pack);
ZSList::Instance()->SendPacket(seller->zone(), seller->instance(), pack);
}
break;
@@ -1789,7 +1788,7 @@ void ZoneServer::SendEmoteMessageRaw(const char* to, uint32 to_guilddbid, int16
void ZoneServer::SendGroupIDs() {
auto pack = new ServerPacket(ServerOP_GroupIDReply, sizeof(ServerGroupIDReply_Struct));
auto sgi = (ServerGroupIDReply_Struct*) pack->pBuffer;
zoneserver_list.NextGroupIDs(sgi->start, sgi->end);
ZSList::Instance()->NextGroupIDs(sgi->start, sgi->end);
SendPacket(pack);
delete pack;
}
@@ -1806,7 +1805,7 @@ void ZoneServer::ChangeWID(uint32 iCharID, uint32 iWID) {
auto scw = (ServerChangeWID_Struct*) pack->pBuffer;
scw->charid = iCharID;
scw->newwid = iWID;
zoneserver_list.SendPacket(pack);
ZSList::Instance()->SendPacket(pack);
delete pack;
}