protect lobby

finreinhard · finreinhard · commit 247a3782f399 · 2025-07-20T23:29:11.000+02:00
diff --git a/src/main/kotlin/li/angu/challengeplugin/ChallengePluginPlugin.kt b/src/main/kotlin/li/angu/challengeplugin/ChallengePluginPlugin.kt
@@ -15,6 +15,7 @@ import li.angu.challengeplugin.listeners.PlayerHealthListener
 import li.angu.challengeplugin.listeners.BlockDropListener
 import li.angu.challengeplugin.listeners.PortalListener
 import li.angu.challengeplugin.listeners.ExperienceBorderListener
+import li.angu.challengeplugin.listeners.LobbyProtectionListener
 import li.angu.challengeplugin.tasks.TimerTask
 import li.angu.challengeplugin.utils.LanguageManager
 
@@ -97,6 +98,7 @@ open class ChallengePluginPlugin : JavaPlugin() {
         server.pluginManager.registerEvents(PlayerConnectionListener(this), this)
         server.pluginManager.registerEvents(PlayerHealthListener(this), this)
         server.pluginManager.registerEvents(PortalListener(this), this)
+        server.pluginManager.registerEvents(LobbyProtectionListener(this), this)
         blockDropListener = BlockDropListener(this)
         server.pluginManager.registerEvents(blockDropListener, this)
 
diff --git a/src/main/kotlin/li/angu/challengeplugin/listeners/LobbyProtectionListener.kt b/src/main/kotlin/li/angu/challengeplugin/listeners/LobbyProtectionListener.kt
@@ -0,0 +1,134 @@
+package li.angu.challengeplugin.listeners
+
+import li.angu.challengeplugin.ChallengePluginPlugin
+import org.bukkit.entity.Player
+import org.bukkit.event.EventHandler
+import org.bukkit.event.Listener
+import org.bukkit.event.block.BlockBreakEvent
+import org.bukkit.event.block.BlockPlaceEvent
+import org.bukkit.event.player.PlayerInteractEvent
+import org.bukkit.event.block.Action
+import org.bukkit.event.entity.EntityDamageByEntityEvent
+import org.bukkit.event.entity.EntityDamageEvent
+import org.bukkit.event.player.PlayerDropItemEvent
+import org.bukkit.event.inventory.InventoryClickEvent
+import org.bukkit.event.player.PlayerPickupItemEvent
+import org.bukkit.event.entity.FoodLevelChangeEvent
+import org.bukkit.event.entity.EntityPickupItemEvent
+
+/**
+ * Protects the lobby world from player modifications and interactions.
+ * Prevents players from breaking, placing, or interacting with blocks in the lobby.
+ */
+class LobbyProtectionListener(private val plugin: ChallengePluginPlugin) : Listener {
+
+    @EventHandler
+    fun onBlockBreak(event: BlockBreakEvent) {
+        val player = event.player
+        if (isInLobby(player)) {
+            event.isCancelled = true
+        }
+    }
+
+    @EventHandler
+    fun onBlockPlace(event: BlockPlaceEvent) {
+        val player = event.player
+        if (isInLobby(player)) {
+            event.isCancelled = true
+        }
+    }
+
+    @EventHandler
+    fun onPlayerInteract(event: PlayerInteractEvent) {
+        val player = event.player
+        
+        // Allow interaction with the menu item
+        if (plugin.lobbyManager.isMenuItem(event.item)) {
+            return
+        }
+        
+        if (isInLobby(player)) {
+            // Cancel interactions with blocks (except air)
+            if (event.action == Action.RIGHT_CLICK_BLOCK || event.action == Action.LEFT_CLICK_BLOCK) {
+                event.isCancelled = true
+            }
+        }
+    }
+
+    @EventHandler
+    fun onEntityDamage(event: EntityDamageEvent) {
+        val entity = event.entity
+        if (entity is Player && isInLobby(entity)) {
+            // Prevent all damage in lobby
+            event.isCancelled = true
+        }
+    }
+
+    @EventHandler
+    fun onEntityDamageByEntity(event: EntityDamageByEntityEvent) {
+        val damager = event.damager
+        val damaged = event.entity
+        
+        // Prevent players from damaging anything in lobby
+        if (damager is Player && isInLobby(damager)) {
+            event.isCancelled = true
+        }
+        
+        // Prevent anything from damaging players in lobby
+        if (damaged is Player && isInLobby(damaged)) {
+            event.isCancelled = true
+        }
+    }
+
+    @EventHandler
+    fun onPlayerDropItem(event: PlayerDropItemEvent) {
+        val player = event.player
+        if (isInLobby(player)) {
+            // Prevent dropping items in lobby
+            event.isCancelled = true
+        }
+    }
+
+    @EventHandler
+    fun onEntityPickupItem(event: EntityPickupItemEvent) {
+        val entity = event.entity
+        if (entity is Player && isInLobby(entity)) {
+            // Prevent picking up items in lobby (except our menu item)
+            val item = event.item.itemStack
+            if (!plugin.lobbyManager.isMenuItem(item)) {
+                event.isCancelled = true
+            }
+        }
+    }
+
+    @EventHandler
+    fun onFoodLevelChange(event: FoodLevelChangeEvent) {
+        val entity = event.entity
+        if (entity is Player && isInLobby(entity)) {
+            // Prevent hunger in lobby
+            event.isCancelled = true
+        }
+    }
+
+    @EventHandler
+    fun onInventoryClick(event: InventoryClickEvent) {
+        val player = event.whoClicked as? Player ?: return
+        if (isInLobby(player)) {
+            // Only allow clicking on the menu item
+            val item = event.currentItem
+            if (item != null && !plugin.lobbyManager.isMenuItem(item)) {
+                // Allow moving the menu item around but prevent other interactions
+                if (event.slot != 0) {
+                    event.isCancelled = true
+                }
+            }
+        }
+    }
+
+    /**
+     * Check if a player is currently in the lobby world
+     */
+    private fun isInLobby(player: Player): Boolean {
+        return plugin.lobbyManager.isLobbyWorld(player.world.name)
+    }
+}
diff --git a/src/main/kotlin/li/angu/challengeplugin/listeners/PlayerConnectionListener.kt b/src/main/kotlin/li/angu/challengeplugin/listeners/PlayerConnectionListener.kt
@@ -61,8 +61,8 @@ class PlayerConnectionListener(private val plugin: ChallengePluginPlugin) : List
         if (plugin.lobbyManager.isLobbyWorld(toWorld.name)) {
             // Check if the player isn't coming from a challenge world
             if (challenge == null) {
-                // Set player to creative mode and give them the menu item
-                player.gameMode = org.bukkit.GameMode.CREATIVE
+                // Set player to survival mode and give them the menu item
+                player.gameMode = org.bukkit.GameMode.SURVIVAL
                 plugin.lobbyManager.setupLobbyInventory(player)
             }
         }
diff --git a/src/main/kotlin/li/angu/challengeplugin/managers/LobbyManager.kt b/src/main/kotlin/li/angu/challengeplugin/managers/LobbyManager.kt
@@ -87,7 +87,7 @@ class LobbyManager(private val plugin: ChallengePluginPlugin) {
     }
 
     /**
-     * Teleport a player to the lobby and set their gamemode to creative
+     * Teleport a player to the lobby and set their gamemode to survival
      * Note: This method does not automatically leave challenges - that should be handled
      * by the calling code if needed.
      */
@@ -101,7 +101,7 @@ class LobbyManager(private val plugin: ChallengePluginPlugin) {
         // Teleport to lobby spawn
         lobbySpawnLocation?.let { spawn ->
             player.teleport(spawn)
-            player.gameMode = GameMode.CREATIVE
+            player.gameMode = GameMode.SURVIVAL
             setupLobbyInventory(player)
 
             // Send welcome message only for new players
