Improved handling of offline player data

freundTech · Apr 13, 2019 · 395d63b · 395d63b
1 parent 6d41566
commit 395d63b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/src/main/kotlin/com/freundtech/minecraft/oneslotserver/extension/PlayerExtension.kt b/src/main/kotlin/com/freundtech/minecraft/oneslotserver/extension/PlayerExtension.kt
@@ -6,6 +6,7 @@ import com.freundtech.minecraft.oneslotserver.util.currentTime
 import com.freundtech.minecraft.oneslotserver.util.delegateTime
 import com.kizitonwose.time.*
 import org.bukkit.GameMode
+import org.bukkit.OfflinePlayer
 import org.bukkit.configuration.file.YamlConfiguration
 import org.bukkit.entity.Player
 import java.nio.file.Files
@@ -37,6 +38,10 @@ class PlayerInfo(uuid: UUID) {
         userConfig.save(configPath.toFile())
     }
 
+    fun join() {
+        joinedAt = currentTime()
+    }
+
     fun hasTimeRemaining(): Boolean {
         val now = currentTime()
         if (this.firstJoin < now - plugin.waitTime) {
@@ -53,6 +58,9 @@ val playerCache = HashMap<UUID, PlayerInfo>()
 val Player.oneSlotServer: PlayerInfo
     get() = playerCache.getOrPut(uniqueId) { PlayerInfo(uniqueId) }
 
+val OfflinePlayer.oneSlotServer: PlayerInfo
+    get() = playerCache.getOrPut(uniqueId) { PlayerInfo(uniqueId) }
+
 fun Player.setSpectator() {
     this.gameMode = GameMode.SPECTATOR
     this.isSleepingIgnored = true

diff --git a/...otlin/com/freundtech/minecraft/oneslotserver/handler/command/SpectateCommandsExecutors.kt b/...otlin/com/freundtech/minecraft/oneslotserver/handler/command/SpectateCommandsExecutors.kt
@@ -63,7 +63,7 @@ class UnspectateCommand(private val plugin: OneSlotServer) : CommandExecutor {
             else -> return false
         }
 
-        target.oneSlotServer.joinedAt = currentTime()
+        target.oneSlotServer.join()
         if (!target.oneSlotServer.hasTimeRemaining()) {
             val waitLeft = plugin.waitTime - (currentTime() - target.oneSlotServer.firstJoin)
             sender.sendMessage("You have no time left on this server. Please wait ${waitLeft.format()}.")

diff --git a/...in/kotlin/com/freundtech/minecraft/oneslotserver/handler/command/TimeCommandsExecutors.kt b/...in/kotlin/com/freundtech/minecraft/oneslotserver/handler/command/TimeCommandsExecutors.kt
@@ -51,7 +51,7 @@ class SetTimeLeftCommand(private val plugin: OneSlotServer) : CommandExecutor {
                 sender.sendMessage("Player $playerName is isn't known to this server")
                 return false
             }
-            PlayerInfo(player.uniqueId).also { it.timeLeft = time }.save()
+            player.oneSlotServer.also { it.timeLeft = time }.save()
             sender.sendMessage("Set time left to $time for $playerName")
         }
         return true

diff --git a/src/main/kotlin/com/freundtech/minecraft/oneslotserver/handler/event/PlayerListener.kt b/src/main/kotlin/com/freundtech/minecraft/oneslotserver/handler/event/PlayerListener.kt
@@ -16,7 +16,7 @@ class PlayerListener(private val plugin: OneSlotServer) : Listener {
         val playerInfo = event.player.oneSlotServer
         val activePlayer = plugin.activePlayer
 
-        event.player.oneSlotServer.joinedAt = currentTime()
+        event.player.oneSlotServer.join()
 
         if (!playerInfo.hasTimeRemaining()) {
             val waitLeft = plugin.waitTime - (now - playerInfo.firstJoin)

diff --git a/...ain/kotlin/com/freundtech/minecraft/oneslotserver/handler/event/ServerListPingListener.kt b/...ain/kotlin/com/freundtech/minecraft/oneslotserver/handler/event/ServerListPingListener.kt
@@ -17,7 +17,7 @@ class ServerListPingListener(private val plugin: OneSlotServer) : Listener{
         event.maxPlayers = 1
 
         event.removeAll { player -> Boolean
-            player.uniqueId != plugin.activePlayer?.player?.uniqueId
+            player.uniqueId != plugin.activePlayer?.uniqueId
         }
 
         plugin.activePlayer?.let {