From bc50977a33ca9bc313af589052c34a1c2054b576 Mon Sep 17 00:00:00 2001 From: Lncvrt Date: Sat, 19 Apr 2025 19:31:38 -0700 Subject: [PATCH] Fix console error if the player doesn't exist in playerdata storage --- .../galaxylobby/event/PlayerGameModeChangeListener.kt | 2 +- .../xyz/lncvrt/galaxylobby/event/PlayerJoinListener.kt | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/xyz/lncvrt/galaxylobby/event/PlayerGameModeChangeListener.kt b/src/main/kotlin/xyz/lncvrt/galaxylobby/event/PlayerGameModeChangeListener.kt index 057fcb5..2be121b 100644 --- a/src/main/kotlin/xyz/lncvrt/galaxylobby/event/PlayerGameModeChangeListener.kt +++ b/src/main/kotlin/xyz/lncvrt/galaxylobby/event/PlayerGameModeChangeListener.kt @@ -13,7 +13,7 @@ class PlayerGameModeChangeListener(val plugin: GalaxyLobbyPlugin) : Listener { if (event.newGameMode === GameMode.CREATIVE) { player.inventory.clear() } else if (event.newGameMode === GameMode.ADVENTURE) { - plugin.resetPlayer(player, false, false) + return } else { event.isCancelled = true player.gameMode = GameMode.ADVENTURE diff --git a/src/main/kotlin/xyz/lncvrt/galaxylobby/event/PlayerJoinListener.kt b/src/main/kotlin/xyz/lncvrt/galaxylobby/event/PlayerJoinListener.kt index d5fac2c..2986e3e 100644 --- a/src/main/kotlin/xyz/lncvrt/galaxylobby/event/PlayerJoinListener.kt +++ b/src/main/kotlin/xyz/lncvrt/galaxylobby/event/PlayerJoinListener.kt @@ -1,5 +1,6 @@ package xyz.lncvrt.galaxylobby.event +import org.bukkit.GameMode import org.bukkit.event.EventHandler import org.bukkit.event.Listener import org.bukkit.event.player.PlayerJoinEvent @@ -11,10 +12,8 @@ class PlayerJoinListener(val plugin: GalaxyLobbyPlugin) : Listener { @EventHandler fun onPlayerJoinEvent(event: PlayerJoinEvent) { val player = event.getPlayer() - - plugin.server.scheduler.runTaskLater(plugin, Runnable { - plugin.resetPlayer(player, true) - }, 1) + plugin.resetPlayer(player, true) + player.gameMode = GameMode.ADVENTURE plugin.server.scheduler.runTaskLater(plugin, Runnable { player.sendComponent("+---------------------***---------------------+")