ver 1.1

src/main/kotlin/xyz/fortern/forternhelper/placeholder/ForternExpansion.kt

@@ -28,25 +28,30 @@ class ForternExpansion(
 
     override fun onRequest(player: OfflinePlayer, params: String): String? {
         if (params.startsWith("peace_")) {
-            val split = params.split("_")
+            // e.g. peace_the_nether_x,z
-            if (split.size == 4) {
+            val first = params.indexOf('_')
-                val worldName = split[1]
+            if(first < 0) return null
-                val chunkX = split[2]
+            val last = params.lastIndexOf('_')
-                val chunkZ = split[3]
+            if (last <= first) return null
-                val world = Bukkit.getWorld(worldName)
+            val chunkPos = params.substring(last + 1)
-                if (world != null) {
+            val split = chunkPos.split(',')
-                    return try {
+            if (split.size < 2) return null
-                        val x = Integer.parseInt(chunkX)
+            val chunkX = split[0]
-                        val z = Integer.parseInt(chunkZ)
+            val chunkZ = split[1]
-                        val loadLevel = world.getChunkAt(x, z).loadLevel
+            val worldName = params.substring(first, last)
-                        if (loadLevel == Chunk.LoadLevel.TICKING || loadLevel == Chunk.LoadLevel.ENTITY_TICKING) {
+            val world = Bukkit.getWorld(worldName)
-                            "true"
+            if (world != null) {
-                        } else {
+                return try {
-                            "false"
+                    val x = Integer.parseInt(chunkX)
-                        }
+                    val z = Integer.parseInt(chunkZ)
-                    } catch (_: NumberFormatException) {
+                    val loadLevel = world.getChunkAt(x, z).loadLevel
-                        null
+                    if (loadLevel == Chunk.LoadLevel.TICKING || loadLevel == Chunk.LoadLevel.ENTITY_TICKING) {
+                        "true"
+                    } else {
+                        "false"
                     }
+                } catch (_: NumberFormatException) {
+                    null
                 }
             }
         }