From 6520a3193873e0e7e2692d816c2dbece77769b5e Mon Sep 17 00:00:00 2001 From: "main()" Date: Tue, 1 May 2012 18:52:05 +0200 Subject: [PATCH] Fixed spawnlocation migration --- .../java/com/onarandombox/MultiverseCore/MVWorld.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/onarandombox/MultiverseCore/MVWorld.java b/src/main/java/com/onarandombox/MultiverseCore/MVWorld.java index 6bc53a13..e8e2778f 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/MVWorld.java +++ b/src/main/java/com/onarandombox/MultiverseCore/MVWorld.java @@ -510,11 +510,6 @@ public class MVWorld extends SerializationConfig implements MultiverseWorld { }; } - /** - * That's the spawn-location when the MVWorld-object wasn't property initialized. - */ - public static final SpawnLocation NULL_LOCATION = new NullLocation(); - /** * Sets the CB-World. *

@@ -530,7 +525,7 @@ public class MVWorld extends SerializationConfig implements MultiverseWorld { this.environment = cbWorld.getEnvironment(); this.seed = cbWorld.getSeed(); this.name = cbWorld.getName(); - if (this.spawnLocation == NULL_LOCATION) + if (this.spawnLocation instanceof NullLocation) this.spawnLocation = new SpawnLocation(readSpawnFromWorld(cbWorld)); this.initPerms(); @@ -621,7 +616,7 @@ public class MVWorld extends SerializationConfig implements MultiverseWorld { this.adjustSpawn = true; this.portalForm = AllowedPortalType.ALL; this.gameMode = GameMode.SURVIVAL; - this.spawnLocation = (world != null) ? new SpawnLocation(world.get().getSpawnLocation()) : NULL_LOCATION; + this.spawnLocation = (world != null) ? new SpawnLocation(world.get().getSpawnLocation()) : new NullLocation(); this.autoLoad = true; this.bedRespawn = true; this.worldBlacklist = new ArrayList();