Upstream/Multiverse-Core
1
0
Fork 0
mirror of https://github.com/Multiverse/Multiverse-Core.git synced 2024-11-26 12:35:39 +01:00
Code Issues Projects Releases Wiki Activity

Fixed spawnlocation migration

Browse Source
This commit is contained in:
main() 2012-05-01 18:52:05 +02:00
parent f1779c9e68
commit 6520a31938
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/onarandombox/MultiverseCore/MVWorld.java
View File

@ -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. * Sets the CB-World.
* <p> * <p>
@ -530,7 +525,7 @@ public class MVWorld extends SerializationConfig implements MultiverseWorld {
this.environment = cbWorld.getEnvironment(); this.environment = cbWorld.getEnvironment();
this.seed = cbWorld.getSeed(); this.seed = cbWorld.getSeed();
this.name = cbWorld.getName(); this.name = cbWorld.getName();
if (this.spawnLocation == NULL_LOCATION) if (this.spawnLocation instanceof NullLocation)
this.spawnLocation = new SpawnLocation(readSpawnFromWorld(cbWorld)); this.spawnLocation = new SpawnLocation(readSpawnFromWorld(cbWorld));
this.initPerms(); this.initPerms();
@ -621,7 +616,7 @@ public class MVWorld extends SerializationConfig implements MultiverseWorld {
this.adjustSpawn = true; this.adjustSpawn = true;
this.portalForm = AllowedPortalType.ALL; this.portalForm = AllowedPortalType.ALL;
this.gameMode = GameMode.SURVIVAL; 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.autoLoad = true;
this.bedRespawn = true; this.bedRespawn = true;
this.worldBlacklist = new ArrayList<String>(); this.worldBlacklist = new ArrayList<String>();