From 7859c875658f41150247408efe766b784d9e7b83 Mon Sep 17 00:00:00 2001 From: ceikry Date: Mon, 9 Aug 2021 19:03:09 -0500 Subject: [PATCH] Cleanup CTZ/ServerStore --- .../src/main/java/core/game/content/zone/ChaosTunnelZone.java | 2 +- Server/src/main/kotlin/rs09/ServerStore.kt | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Server/src/main/java/core/game/content/zone/ChaosTunnelZone.java b/Server/src/main/java/core/game/content/zone/ChaosTunnelZone.java index 43f2b83df..409ced2bb 100644 --- a/Server/src/main/java/core/game/content/zone/ChaosTunnelZone.java +++ b/Server/src/main/java/core/game/content/zone/ChaosTunnelZone.java @@ -263,7 +263,7 @@ public final class ChaosTunnelZone extends MapZone implements Plugin { * @param player The player. */ private void commenceBorkBattle(Player player) { - if (ServerStore.INSTANCE.getBoolean(getStoreFile(), player.getUsername().toLowerCase()) && GameWorld.getSettings().isHosted()) { + if (ServerStore.getBoolean(getStoreFile(), player.getUsername().toLowerCase()) && GameWorld.getSettings().isHosted()) { player.getPacketDispatch().sendMessage("The portal's magic is too weak to teleport you right now."); return; } diff --git a/Server/src/main/kotlin/rs09/ServerStore.kt b/Server/src/main/kotlin/rs09/ServerStore.kt index aa42288f1..926be761a 100644 --- a/Server/src/main/kotlin/rs09/ServerStore.kt +++ b/Server/src/main/kotlin/rs09/ServerStore.kt @@ -100,14 +100,17 @@ object ServerStore { } } + @JvmStatic fun JSONObject.getString(key: String): String { return this[key] as? String ?: "nothing" } + @JvmStatic fun JSONObject.getLong(key: String): Long { return this[key] as? Long ?: 0L } + @JvmStatic fun JSONObject.getBoolean(key: String): Boolean { return this[key] as? Boolean ?: false }