Skip to content

Commit 3c195ee

Browse files
committed
Fix 2nd client crashing on trying to join a server via localhost
Removes unnecessary and too early registration step and fixes a whitelist issue
1 parent acb4846 commit 3c195ee

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

engine/src/main/java/org/terasology/engine/core/modes/StateLoading.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,6 @@ private void initClient(GameEngine engine, ServiceRegistry serviceRegistry) {
173173
// loadProcesses.add(new ProcessBlockPrefabs(context));
174174
loadProcesses.add(new LoadExtraBlockData(serviceRegistry));
175175
loadProcesses.add(new InitialiseComponentSystemManager(serviceRegistry));
176-
if (!headless) {
177-
loadProcesses.add(new RegisterInputSystem(context));
178-
}
179176
// loadProcesses.add(new RegisterSystems(context, netMode));
180177
// loadProcesses.add(new RegisterWorldSystems(gameManifest, context));
181178
loadProcesses.add(new InitialiseCommandSystem(serviceRegistry));

engine/src/main/java/org/terasology/engine/core/module/ExternalApiWhitelist.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ public final class ExternalApiWhitelist {
5656
public static final Set<String> PACKAGES = new ImmutableSet.Builder<String>()
5757
.addAll(NUI_PACKAGES)
5858
.addAll(GESTALT_ECS_PACKAGES)
59+
// Allow persistence internals needed during client join (EntityRestorer, etc.)
60+
.add("org.terasology.engine.persistence.internal")
5961
.add("org.terasology.math")
6062
.add("org.terasology.math.geom")
6163
.add("org.terasology.joml.geom")

0 commit comments

Comments
 (0)