Merge branch 'main' into TNTLeague/TeamsOnSameLine

TNTLeague/src/de/steamwar/tntleague/events/GlobalListener.kt

@@ -19,9 +19,7 @@
 
 package de.steamwar.tntleague.events
 
-import de.steamwar.kotlin.inventory.SWInventoryHolder
 import de.steamwar.message.SubMessage
-import de.steamwar.tntleague.colorByTeam
 import de.steamwar.tntleague.config.TNTLeagueWorldConfig
 import de.steamwar.tntleague.game.TNTLeagueGame
 import de.steamwar.tntleague.game.TNTLeagueTeam
@@ -34,9 +32,7 @@ import org.bukkit.event.EventPriority
 import org.bukkit.event.Listener
 import org.bukkit.event.entity.PlayerDeathEvent
 import org.bukkit.event.inventory.CraftItemEvent
-import org.bukkit.event.inventory.InventoryClickEvent
 import org.bukkit.event.player.*
-import java.util.logging.Level
 
 object GlobalListener: Listener {
 
@@ -66,15 +62,6 @@ object GlobalListener: Listener {
         e.isCancelled = true
     }
 
-    @EventHandler(priority = EventPriority.LOWEST)
-    fun onPlayerClick(e: InventoryClickEvent) {
-        val holder = e.inventory.getHolder(false)
-        if (holder is SWInventoryHolder && e.clickedInventory == holder._inventory) {
-            e.isCancelled = true
-            holder.handleInventoryClick(e)
-        }
-    }
-
     @EventHandler(priority = EventPriority.LOWEST)
     fun onPlayerMove(e: PlayerMoveEvent) {
         if (e.to.blockY < TNTLeagueWorldConfig.minHeight) {

TNTLeague/src/de/steamwar/tntleague/events/IngameListener.kt

@@ -27,13 +27,11 @@ import de.steamwar.tntleague.inventory.DealerInventory
 import de.steamwar.tntleague.util.TNTLeagueScoreboard
 import org.bukkit.GameMode
 import org.bukkit.Location
-import org.bukkit.Material
 import org.bukkit.entity.EntityType
 import org.bukkit.event.EventHandler
 import org.bukkit.event.Listener
 import org.bukkit.event.entity.EntityExplodeEvent
 import org.bukkit.event.player.PlayerAttemptPickupItemEvent
-import org.bukkit.event.player.PlayerDropItemEvent
 import org.bukkit.event.player.PlayerInteractEntityEvent
 import org.bukkit.event.player.PlayerJoinEvent
 import org.bukkit.event.player.PlayerMoveEvent
@@ -46,7 +44,7 @@ object IngameListener : Listener {
 
         if (e.rightClicked.type == EntityType.WANDERING_TRADER) {
             e.isCancelled = true
-            e.player.openInventory(DealerInventory(e.player).getInventory())
+            DealerInventory(e.player).open()
         }
     }
 
@@ -75,13 +73,6 @@ object IngameListener : Listener {
         }
     }
 
-    @EventHandler
-    fun onDropPickaxe(e: PlayerDropItemEvent) {
-        if (e.itemDrop.itemStack.type == Material.DIAMOND_PICKAXE) {
-            e.isCancelled = true
-        }
-    }
-
     @EventHandler
     fun onPickupCoins(e: PlayerAttemptPickupItemEvent) {
         if (e.item.itemStack.isSimilar(DealerInventory.coins)) {

TNTLeague/src/de/steamwar/tntleague/events/LobbyListener.kt

@@ -39,11 +39,6 @@ object LobbyListener: Listener {
         }
     }
 
-    @EventHandler(priority = EventPriority.LOWEST)
-    fun onPlayerQuit(e: PlayerQuitEvent) {
-        TNTLeagueGame.playerLeave(e.player)
-    }
-
     @EventHandler
     fun onPlayerDamage(e: EntityDamageEvent) {
         e.isCancelled = true