[Crash] Fix Zone deconstructor crashes (#4325)

This commit is contained in:
Chris Miles 2024-05-24 20:54:16 -05:00 committed by GitHub
parent 98b137154a
commit e1344039ff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1098,20 +1098,21 @@ Zone::Zone(uint32 in_zoneid, uint32 in_instanceid, const char* in_short_name)
Zone::~Zone() { Zone::~Zone() {
spawn2_list.Clear(); spawn2_list.Clear();
safe_delete(zonemap);
safe_delete(watermap);
safe_delete(pathing);
if (worldserver.Connected()) { if (worldserver.Connected()) {
worldserver.SetZoneData(0); worldserver.SetZoneData(0);
} }
safe_delete_array(short_name);
safe_delete_array(long_name);
safe_delete(Weather_Timer);
npc_emote_list.clear(); npc_emote_list.clear();
zone_point_list.Clear(); zone_point_list.Clear();
entity_list.Clear(); entity_list.Clear();
parse->ReloadQuests();
ClearBlockedSpells(); ClearBlockedSpells();
safe_delete_array(short_name);
safe_delete_array(long_name);
safe_delete(Weather_Timer);
safe_delete(zonemap);
safe_delete(watermap);
safe_delete(pathing);
safe_delete(Instance_Timer); safe_delete(Instance_Timer);
safe_delete(Instance_Shutdown_Timer); safe_delete(Instance_Shutdown_Timer);
safe_delete(Instance_Warning_timer); safe_delete(Instance_Warning_timer);