mirror of
https://github.com/EQEmu/Server.git
synced 2025-12-11 16:51:29 +00:00
[Fix] Always spawn zone controller first (#4669)
This commit is contained in:
parent
432452c5c7
commit
843f6531a7
@ -859,9 +859,9 @@ void NPC::Depop(bool start_spawn_timer) {
|
||||
|
||||
bool NPC::SpawnZoneController()
|
||||
{
|
||||
|
||||
if (!RuleB(Zone, UseZoneController))
|
||||
if (!RuleB(Zone, UseZoneController)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
auto npc_type = new NPCType;
|
||||
memset(npc_type, 0, sizeof(NPCType));
|
||||
|
||||
@ -498,6 +498,8 @@ bool ZoneDatabase::PopulateZoneSpawnList(uint32 zoneid, LinkedList<Spawn2*> &spa
|
||||
);
|
||||
}
|
||||
|
||||
NPC::SpawnZoneController();
|
||||
|
||||
for (auto &s: spawns) {
|
||||
uint32 spawn_time_left = 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()));
|
||||
|
||||
NPC::SpawnZoneController();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user