From 2436340765c706b2a46a7038a4b39771276c9b3e Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Fri, 13 Dec 2024 19:13:14 +0100 Subject: [PATCH] Fixes and Balances --- .../src/de/steamwar/tntleague/events/GlobalListener.kt | 6 ++++++ TNTLeague/src/de/steamwar/tntleague/game/TNTLeagueGame.kt | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/TNTLeague/src/de/steamwar/tntleague/events/GlobalListener.kt b/TNTLeague/src/de/steamwar/tntleague/events/GlobalListener.kt index 0b31a448..e930106b 100644 --- a/TNTLeague/src/de/steamwar/tntleague/events/GlobalListener.kt +++ b/TNTLeague/src/de/steamwar/tntleague/events/GlobalListener.kt @@ -33,6 +33,7 @@ import org.bukkit.event.EventHandler 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.PlayerJoinEvent import org.bukkit.event.player.PlayerMoveEvent @@ -65,6 +66,11 @@ object GlobalListener: Listener { } } + @EventHandler + fun onPlayerCraft(e: CraftItemEvent) { + e.isCancelled = true + } + @EventHandler(priority = EventPriority.LOWEST) fun onPlayerClick(e: InventoryClickEvent) { val holder = e.inventory.getHolder(false) diff --git a/TNTLeague/src/de/steamwar/tntleague/game/TNTLeagueGame.kt b/TNTLeague/src/de/steamwar/tntleague/game/TNTLeagueGame.kt index e781c045..8c278620 100644 --- a/TNTLeague/src/de/steamwar/tntleague/game/TNTLeagueGame.kt +++ b/TNTLeague/src/de/steamwar/tntleague/game/TNTLeagueGame.kt @@ -100,7 +100,12 @@ object TNTLeagueGame { timerTask = plugin.server.scheduler.runTaskTimer(plugin, bukkit { gameTimeRemaining-- if (gameTimeRemaining == 0) { - draw(WinReason.TIMEOUT) + if (blueTeam.damagedBlocks > redTeam.damagedBlocks) + win(blueTeam, WinReason.TIMEOUT) + else if (redTeam.damagedBlocks > blueTeam.damagedBlocks) + win(redTeam, WinReason.TIMEOUT) + else + draw(WinReason.TIMEOUT) return@bukkit }