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

[Fix] Always spawn zone controller first (#4669)

Browse Source
This commit is contained in:
Chris Miles 2025-02-11 21:19:15 -06:00 committed by GitHub
parent 432452c5c7
commit 843f6531a7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zone/npc.cpp
View File

@ -859,9 +859,9 @@ void NPC::Depop(bool start_spawn_timer) {
bool NPC::SpawnZoneController() bool NPC::SpawnZoneController()
{ {
if (!RuleB(Zone, UseZoneController)) {
if (!RuleB(Zone, UseZoneController))
return false; return false;
}
auto npc_type = new NPCType; auto npc_type = new NPCType;
memset(npc_type, 0, sizeof(NPCType)); memset(npc_type, 0, sizeof(NPCType));

4
zone/spawn2.cpp
View File

@ -498,6 +498,8 @@ bool ZoneDatabase::PopulateZoneSpawnList(uint32 zoneid, LinkedList<Spawn2*> &spa
); );
} }
NPC::SpawnZoneController();
for (auto &s: spawns) { for (auto &s: spawns) {
uint32 spawn_time_left = 0; uint32 spawn_time_left = 0;
if (spawn_times.count(s.id) != 0) { if (spawn_times.count(s.id) != 0) {
@ -538,8 +540,6 @@ bool ZoneDatabase::PopulateZoneSpawnList(uint32 zoneid, LinkedList<Spawn2*> &spa
LogInfo("Loaded [{}] spawn2 entries", Strings::Commify(l.size())); LogInfo("Loaded [{}] spawn2 entries", Strings::Commify(l.size()));
NPC::SpawnZoneController();
return true; return true;
} }