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

[Crash] Fix world repop crash (#4742)

Browse Source
This commit is contained in:
Chris Miles 2025-03-03 00:04:39 -06:00 committed by GitHub
parent 212969f5cd
commit 3902230fa1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
world/zonelist.cpp
View File

@ -894,7 +894,8 @@ void ZSList::SendServerReload(ServerReload::Type type, uchar *packet)
ServerReload::Type::Commands, ServerReload::Type::Commands,
ServerReload::Type::PerlExportSettings, ServerReload::Type::PerlExportSettings,
ServerReload::Type::DataBucketsCache, ServerReload::Type::DataBucketsCache,
ServerReload::Type::WorldRepop ServerReload::Type::WorldRepop,
ServerReload::Type::WorldWithRespawn
}; };
// Set requires_zone_booted flag before executing reload logic // Set requires_zone_booted flag before executing reload logic

8
zone/worldserver.cpp
View File

@ -4661,16 +4661,20 @@ void WorldServer::ProcessReload(const ServerReload::Request& request)
break; break;
case ServerReload::Type::WorldRepop: case ServerReload::Type::WorldRepop:
entity_list.ClearAreas();
parse->ReloadQuests(); parse->ReloadQuests();
if (zone && zone->IsLoaded()) {
entity_list.ClearAreas();
zone->Repop(); zone->Repop();
}
break; break;
case ServerReload::Type::WorldWithRespawn: case ServerReload::Type::WorldWithRespawn:
entity_list.ClearAreas();
parse->ReloadQuests(); parse->ReloadQuests();
if (zone && zone->IsLoaded()) {
entity_list.ClearAreas();
zone->Repop(); zone->Repop();
zone->ClearSpawnTimers(); zone->ClearSpawnTimers();
}
break; break;
case ServerReload::Type::ZonePoints: case ServerReload::Type::ZonePoints: