Merge PR #2815 by @0shine0 - world preview hardening.

MovingBlocks · Mar 14, 2017 · 1336be5 · 1336be5
2 parents 1efe1dc + a5b1c8e
commit 1336be5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/engine/src/main/java/org/terasology/rendering/nui/layers/mainMenu/CreateGameScreen.java b/engine/src/main/java/org/terasology/rendering/nui/layers/mainMenu/CreateGameScreen.java
@@ -256,8 +256,8 @@ public Boolean get() {
             }
         };
         previewSeed.bindEnabled(worldGeneratorSelected);
+        PreviewWorldScreen screen = getManager().createScreen(PreviewWorldScreen.ASSET_URI, PreviewWorldScreen.class);
         WidgetUtil.trySubscribe(this, "previewSeed", button -> {
-            PreviewWorldScreen screen = getManager().createScreen(PreviewWorldScreen.ASSET_URI, PreviewWorldScreen.class);
             if (screen != null) {
                 screen.bindSeed(BindHelper.bindBeanProperty("text", seed, String.class));
                 try {

diff --git a/engine/src/main/java/org/terasology/rendering/nui/layers/mainMenu/SelectGameScreen.java b/engine/src/main/java/org/terasology/rendering/nui/layers/mainMenu/SelectGameScreen.java
@@ -84,8 +84,8 @@ public String get() {
         refreshList(gameList);
         gameList.subscribe((widget, item) -> loadGame(item));
 
+        CreateGameScreen screen = getManager().createScreen(CreateGameScreen.ASSET_URI, CreateGameScreen.class);
         WidgetUtil.trySubscribe(this, "create", button -> {
-            CreateGameScreen screen = getManager().createScreen(CreateGameScreen.ASSET_URI, CreateGameScreen.class);
             screen.setLoadingAsServer(loadingAsServer);
             triggerForwardAnimation(screen);
         });

diff --git a/engine/src/main/java/org/terasology/world/generation/BaseFacetedWorldGenerator.java b/engine/src/main/java/org/terasology/world/generation/BaseFacetedWorldGenerator.java
@@ -25,7 +25,7 @@ public abstract class BaseFacetedWorldGenerator implements WorldGenerator {
     private final SimpleUri uri;
 
     private String worldSeed;
-    private WorldBuilder worldBuilder;
+    protected WorldBuilder worldBuilder;
     private World world;
 
     private FacetedWorldConfigurator configurator;