Fix spawn location in world config should use SpawnLocation class not bukkit Location

Author: benwoo1110

src/main/java/org/mvplugins/multiverse/core/world/MultiverseWorld.java

@@ -14,6 +14,7 @@
 
 import org.mvplugins.multiverse.core.configuration.handle.StringPropertyHandle;
 import org.mvplugins.multiverse.core.world.config.AllowedPortalType;
+import org.mvplugins.multiverse.core.world.config.SpawnLocation;
 import org.mvplugins.multiverse.core.world.config.WorldConfig;
 
 /**
@@ -533,7 +534,7 @@ public long getSeed() {
      *
      * @return The spawn location of this world.
      */
-    public Location getSpawnLocation() {
+    public SpawnLocation getSpawnLocation() {
         return worldConfig.getSpawnLocation();
     }
 
@@ -544,6 +545,17 @@ public Location getSpawnLocation() {
      * @return Result of setting property.
      */
     public Try<Void> setSpawnLocation(Location spawnLocation) {
+        return setSpawnLocation(new SpawnLocation(spawnLocation));
+    }
+
+    /**
+     * Sets the spawn location for a world.
+     *
+     * @param spawnLocation The spawn location for a world.
+     * @return Result of setting property.
+     */
+    public Try<Void> setSpawnLocation(SpawnLocation spawnLocation) {
+        //todo: Maybe check of safe location if adjust spawn is enabled
         return worldConfig.setSpawnLocation(spawnLocation);
     }
 

src/main/java/org/mvplugins/multiverse/core/world/config/WorldConfig.java

@@ -301,11 +301,11 @@ public Try<Void> setSeed(long seed) {
         return configHandle.set(configNodes.SEED, seed);
     }
 
-    public Location getSpawnLocation() {
+    public SpawnLocation getSpawnLocation() {
         return configHandle.get(configNodes.SPAWN_LOCATION);
     }
 
-    public Try<Void> setSpawnLocation(Location spawnLocation) {
+    public Try<Void> setSpawnLocation(SpawnLocation spawnLocation) {
         return configHandle.set(configNodes.SPAWN_LOCATION, spawnLocation);
     }
 

src/main/java/org/mvplugins/multiverse/core/world/config/WorldConfigNodes.java

@@ -186,7 +186,7 @@ private <N extends Node> N node(N node) {
             .name(null)
             .build());
 
-    final ConfigNode<Location> SPAWN_LOCATION = node(ConfigNode.builder("spawn-location", Location.class)
+    final ConfigNode<SpawnLocation> SPAWN_LOCATION = node(ConfigNode.builder("spawn-location", SpawnLocation.class)
             .defaultValue(NullLocation.get())
             .name(null)
             .onSetValue((oldValue, newValue) -> {