|
@@ -531,7 +531,7 @@ void ZoneServer::DeleteData(bool boot_clients){
|
|
client->Disconnect();
|
|
client->Disconnect();
|
|
}
|
|
}
|
|
else{
|
|
else{
|
|
- RemoveSpawnSupportFunctions(spawn, boot_clients, boot_clients);
|
|
|
|
|
|
+ RemoveSpawnSupportFunctions(spawn, boot_clients, true);
|
|
RemoveSpawnFromGrid(spawn, spawn->GetLocation());
|
|
RemoveSpawnFromGrid(spawn, spawn->GetLocation());
|
|
AddPendingDelete(spawn);
|
|
AddPendingDelete(spawn);
|
|
}
|
|
}
|
|
@@ -1716,7 +1716,7 @@ bool ZoneServer::Process()
|
|
if(startupDelayTimer.Check())
|
|
if(startupDelayTimer.Check())
|
|
startupDelayTimer.Disable();
|
|
startupDelayTimer.Disable();
|
|
|
|
|
|
- if(spellProcess)
|
|
|
|
|
|
+ if(!reloading && spellProcess)
|
|
spellProcess->Process();
|
|
spellProcess->Process();
|
|
if (tradeskillMgr)
|
|
if (tradeskillMgr)
|
|
tradeskillMgr->Process();
|
|
tradeskillMgr->Process();
|
|
@@ -1783,7 +1783,7 @@ bool ZoneServer::Process()
|
|
CheckWidgetTimers();
|
|
CheckWidgetTimers();
|
|
|
|
|
|
// spawn_script_timers loop
|
|
// spawn_script_timers loop
|
|
- if(!zoneShuttingDown)
|
|
|
|
|
|
+ if(!reloading && !zoneShuttingDown)
|
|
CheckSpawnScriptTimers();
|
|
CheckSpawnScriptTimers();
|
|
|
|
|
|
// Check to see if a dead spawn needs to be removed
|
|
// Check to see if a dead spawn needs to be removed
|