TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 16:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #265 from Azaezel/alpha40_dbCacheClearCorrectly

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

8
Templates/BaseGame/game/core/clientServer/scripts/server/levelLoad.cs
View file

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

2
Templates/BaseGame/game/core/clientServer/scripts/server/server.cs
View file

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