Merge pull request #265 from Azaezel/alpha40_dbCacheClearCorrectly

proper variation on the datablock file list erasure
This commit is contained in:
Brian Roberts 2020-07-30 11:49:06 -05:00 committed by GitHub
commit 3bc479a921
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions

View file

@ -163,6 +163,10 @@ function endMission()
getScene(0).delete();
MissionCleanup.delete();
if ($Pref::Server::EnableDatablockCache)
resetDatablockCache();
DatablockFilesList.empty();
clearServerPaths();
}
@ -176,6 +180,10 @@ function resetMission()
new SimGroup( MissionCleanup );
$instantGroup = MissionCleanup;
if ($Pref::Server::EnableDatablockCache)
resetDatablockCache();
DatablockFilesList.empty();
clearServerPaths();
// Inform the game code we're resetting.

View file

@ -201,7 +201,6 @@ function onServerCreated()
physicsInitWorld( "server" );
physicsStartSimulation("server");
DatablockFilesList.clear();
loadDatablockFiles( DatablockFilesList, true );
callOnModules("onServerScriptExec", "Core");
@ -287,6 +286,7 @@ function onServerDestroyed()
if ($Pref::Server::EnableDatablockCache)
resetDatablockCache();
DatablockFilesList.empty();
}
/// Guid list maintenance functions