Skip to content

Commit 1e9a36c

Browse files
committed
Revert "bugfix: assetTypeManager becomes unavalible becomes of RegisterMods also might be a potentaial race condition"
This reverts commit 9cffcbb.
1 parent 9cffcbb commit 1e9a36c

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

engine/src/main/java/org/terasology/engine/core/TerasologyEngine.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import org.terasology.engine.context.internal.ContextImpl;
1515
import org.terasology.engine.core.bootstrap.EnvironmentSwitchHandler;
1616
import org.terasology.engine.core.modes.GameState;
17-
import org.terasology.engine.core.modes.StateLoading;
1817
import org.terasology.engine.core.module.ExternalApiWhitelist;
1918
import org.terasology.engine.core.module.ModuleManager;
2019
import org.terasology.engine.core.paths.PathManager;
@@ -469,9 +468,7 @@ public boolean tick() {
469468
return false;
470469
}
471470

472-
// environment switch occurs during loading assetTypeManager can become invalid.
473-
// potential race condition RegisterMods#step so make sure the current state is not loading
474-
if (assetTypeManager instanceof AutoReloadAssetTypeManager && !(currentState instanceof StateLoading) ) {
471+
if (assetTypeManager instanceof AutoReloadAssetTypeManager) {
475472
((AutoReloadAssetTypeManager) assetTypeManager).reloadChangedAssets();
476473
}
477474

0 commit comments

Comments
 (0)