Upstream/Multiverse-Core
1
0
Fork 0
mirror of https://github.com/Multiverse/Multiverse-Core.git synced 2024-11-22 10:36:06 +01:00
Code Issues Projects Releases Wiki Activity

Fixed issue where Multiverse always checks block safety to fix world spawns on startup/reload.

Browse Source
This commit is contained in:
Jeremy Wood 2012-11-23 11:49:14 -05:00
parent 876456b932
commit 58eeecbcb8
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,11 +71,15 @@ public class MVWorld implements MultiverseWorld {
final Location worldSpawnLocation = readSpawnFromWorld(world);
this.props.setValidator("spawn", spawnValidator);
if (this.props.spawnLocation instanceof NullLocation) {
this.props.spawnLocation = new SpawnLocation(worldSpawnLocation);
final SpawnLocation newLoc = new SpawnLocation(worldSpawnLocation);
this.props.spawnLocation = newLoc;
world.setSpawnLocation(newLoc.getBlockX(), newLoc.getBlockY(), newLoc.getBlockZ());
} else {
this.props.spawnLocation.setWorld(world);
if (plugin.getBlockSafety().playerCanSpawnHereSafely(this.props.spawnLocation)) {
this.props.spawnLocation = new SpawnLocation(worldSpawnLocation);
final SpawnLocation newLoc = new SpawnLocation(worldSpawnLocation);
this.props.spawnLocation = newLoc;
world.setSpawnLocation(newLoc.getBlockX(), newLoc.getBlockY(), newLoc.getBlockZ());
}
}