v2.2.2:

- Fixed Location loading from the config when the world is not loaded yet

Author: randombyte-developer

build.gradle

@@ -6,7 +6,7 @@ plugins {
 }
 
 group "de.randombyte"
-version "2.2.1"
+version "2.2.2"
 
 repositories {
     jcenter()

src/main/kotlin/de/randombyte/unity/Unity.kt

@@ -56,7 +56,7 @@ class Unity @Inject constructor(
     companion object {
         const val ID = "unity"
         const val NAME = "Unity"
-        const val VERSION = "2.2.1"
+        const val VERSION = "2.2.2"
         const val AUTHOR = "RandomByte"
 
         const val NUCLEUS_ID = "nucleus"

src/main/kotlin/de/randombyte/unity/commands/HomeCommand.kt

@@ -2,6 +2,8 @@ package de.randombyte.unity.commands
 
 import de.randombyte.kosp.extensions.toText
 import de.randombyte.unity.config.Config
+import de.randombyte.unity.config.Config.Unity.HomeLocation.*
+import de.randombyte.unity.config.Config.Unity.HomeLocation.Set
 import de.randombyte.unity.config.ConfigAccessor
 import org.spongepowered.api.command.CommandException
 import org.spongepowered.api.command.CommandResult
@@ -12,8 +14,12 @@ class HomeCommand(
         configAccessor: ConfigAccessor
 ) : UnityCommand(configAccessor) {
     override fun executedByUnityMember(player: Player, args: CommandContext, thisUnity: Config.Unity, config: Config): CommandResult {
-        val home = thisUnity.home ?: throw CommandException("No home set!".toText())
-        player.location = home
+        val home = thisUnity.tryGetHomeLocation()
+        when (home) {
+            NotSet -> throw CommandException("No home set!".toText())
+            Unreachable -> throw CommandException("The home is not reachable! The world is not loaded.".toText())
+            is Set -> player.location = home.location
+        }
 
         return CommandResult.success()
     }

src/main/kotlin/de/randombyte/unity/commands/SetHomeCommand.kt

@@ -2,6 +2,7 @@ package de.randombyte.unity.commands
 
 import de.randombyte.kosp.extensions.green
 import de.randombyte.unity.config.Config
+import de.randombyte.unity.config.Config.Unity.ConfigLocation
 import de.randombyte.unity.config.ConfigAccessor
 import org.spongepowered.api.command.CommandResult
 import org.spongepowered.api.command.args.CommandContext
@@ -12,7 +13,8 @@ class SetHomeCommand(
 ) : UnityCommand(configAccessor) {
     override fun executedByUnityMember(player: Player, args: CommandContext, thisUnity: Config.Unity, config: Config): CommandResult {
         val newHome = player.location
-        configAccessor.set(config.copy(unities = (config.unities - thisUnity) + thisUnity.copy(home = newHome)))
+        configAccessor.set(config.copy(
+                unities = (config.unities - thisUnity) + thisUnity.copy(home = ConfigLocation(newHome))))
 
         thisUnity.sendMessage("New home set".green())
 

src/main/kotlin/de/randombyte/unity/config/Config.kt

@@ -2,8 +2,11 @@ package de.randombyte.unity.config
 
 import de.randombyte.kosp.extensions.*
 import de.randombyte.kosp.fixedTextTemplateOf
+import de.randombyte.unity.config.Config.Unity.HomeLocation.*
+import de.randombyte.unity.config.Config.Unity.HomeLocation.Set
 import ninja.leaping.configurate.objectmapping.Setting
 import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable
+import org.spongepowered.api.Sponge
 import org.spongepowered.api.text.Text
 import org.spongepowered.api.text.TextTemplate
 import org.spongepowered.api.world.Location
@@ -24,9 +27,22 @@ data class Config(
     data class Unity(
             @Setting("member1") val member1: UUID = UUID(0, 0),
             @Setting("member2") val member2: UUID = UUID(0, 0),
-            @Setting("home") val home: Location<World>? = null,
+            @Setting("home") val home: ConfigLocation? = null,
             @Setting("date") val date: Date = Date.from(Instant.EPOCH)
     ) {
+
+        // retro fits the Sponge Location serialization format, but we have control over when to
+        // load and construct the Location
+        @ConfigSerializable
+        class ConfigLocation(
+                @Setting("WorldUuid") val worldUuid: UUID = UUID(0, 0),
+                @Setting("X") val x: Double = 0.0,
+                @Setting("Y") val y: Double = 0.0,
+                @Setting("Z") val z: Double = 0.0
+        ) {
+            constructor(location: Location<World>) : this(location.extent.uniqueId, location.x, location.y, location.z)
+        }
+
         fun sendMessage(text: Text) {
             member1.getPlayer()?.sendMessage(text)
             member2.getPlayer()?.sendMessage(text)
@@ -37,6 +53,18 @@ data class Config(
             member2 == member -> member1
             else -> throw RuntimeException("Getting other member failed, report to developer!")
         }
+
+        sealed class HomeLocation {
+            object NotSet : HomeLocation()
+            object Unreachable : HomeLocation()
+            class Set(val location: Location<World>) : HomeLocation()
+        }
+
+        fun tryGetHomeLocation(): HomeLocation {
+            if (home == null) return NotSet
+            val world = Sponge.getServer().getWorld(home.worldUuid).orNull() ?: return Unreachable
+            return Set(world.getLocation(home.x, home.y, home.z))
+        }
     }
 
     @ConfigSerializable