Fix warps not working, and Add lava bucket detection

Author: kruthers

build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "com.kruthers"
-version = "2.4.1"
+version = "2.4.2"
 description = "The core plugin used to manage the gamemode 4 public server"
 
 repositories {

src/main/kotlin/com/kruthers/gamemode4core/Gamemode4Core.kt

@@ -120,7 +120,7 @@ class Gamemode4Core : JavaPlugin() {
         annotationParser.parse(WarpCommand(this))
         annotationParser.parse(ManageWarpsCommand(this))
 
-        this.logger.info("Loaded all tab completer's, registering events...")
+        this.logger.info("Loaded all tab completers, registering events...")
         this.server.pluginManager.registerEvents(PlayerConnectionEvents(this), this)
         this.server.pluginManager.registerEvents(PlayerFrozenEvents(this), this)
         this.server.pluginManager.registerEvents(DimensionEvents(this), this)

src/main/kotlin/com/kruthers/gamemode4core/commands/ManageWarpsCommand.kt

@@ -72,7 +72,7 @@ class ManageWarpsCommand(val plugin: Gamemode4Core) {
 
     @ProxiedBy("warps")
     @CommandMethod("managewarps lists")
-    @CommandDescription("Remove a warp")
+    @CommandDescription("List all warps")
     @CommandPermission("gm4core.warp")
     fun onWarpListCommand(sender: CommandSender) {
         WarpCommand.sendWarpsList(sender,plugin)
@@ -82,7 +82,6 @@ class ManageWarpsCommand(val plugin: Gamemode4Core) {
     @Parser(name = "warpNameAdd")
     fun warpNameParser(sender: CommandContext<CommandSender>, inputQueue: Queue<String>): String {
         val input = inputQueue.remove()
-        sender.sender.sendMessage(input)
 
         if (input.matches("[\\w\\-]{3,}".toRegex()) && input.lowercase() != "list") {
             return  input

src/main/kotlin/com/kruthers/gamemode4core/commands/WarpCommand.kt

@@ -12,6 +12,7 @@ import com.kruthers.gamemode4core.utils.parseString
 import net.kyori.adventure.text.Component
 import net.kyori.adventure.text.format.NamedTextColor
 import net.kyori.adventure.text.minimessage.MiniMessage
+import org.bukkit.Bukkit
 import org.bukkit.Location
 import org.bukkit.command.CommandSender
 import org.bukkit.entity.Player
@@ -22,14 +23,14 @@ class WarpCommand(val plugin: Gamemode4Core) {
         val warps: HashMap<String, Location> = HashMap()
 
         fun sendWarpsList(sender: CommandSender, plugin: Gamemode4Core) {
-            val warpsText = parseString("<prefix> <green>Current warps:</green>",plugin)
+            var warpsText = parseString("<prefix> <green>Current warps: </green>",plugin)
             val warpsSize = warps.size
             var i = 0
             warps.forEach { (warp, _) ->
                 val text = MiniMessage.miniMessage().deserialize("<hover:show_text:'<dark_purple>Teleport to $warp" +
                         "</dark_purple>'><click:run_command:'/warp $warp'><gold>$warp</gold></click></hover>")
 
-                warpsText.append(text)
+                warpsText = warpsText.append(text)
                 i++
                 if (i < warpsSize) {
                     warpsText.append(Component.text(", ", NamedTextColor.GREEN))
@@ -40,11 +41,11 @@ class WarpCommand(val plugin: Gamemode4Core) {
         }
     }
 
-    @CommandMethod("warp [warp]")
+    @CommandMethod("warp <warp>")
     @CommandDescription("warp to a location")
     @CommandPermission("gm4core.warp")
-    fun onWarpCommand(player: Player, @Argument("warp", parserName = "warp") warp: Pair<String,Location>?) {
-        if (warp === null) {
+    fun onWarpCommand(player: Player, @Argument("warp", parserName = "warp") warp: Pair<String,Location>) {
+        if (warp .first == "list") {
             sendWarpsList(player, plugin)
         } else {
             plugin.addTPALocation(player)
@@ -63,16 +64,22 @@ class WarpCommand(val plugin: Gamemode4Core) {
                 response.add(warp)
             }
         }
+        if ("list".startsWith(input)) {
+            response.add("list")
+        }
 
         return response.toList()
     }
 
-    @Parser(name = "warp")
+    @Parser(name = "warp", suggestions = "warp")
     fun coreArgsParser(sender: CommandContext<CommandSender>, inputQueue: Queue<String>): Pair<String,Location> {
-        val input = inputQueue.peek().lowercase()
+        val input = inputQueue.remove().lowercase()
+        if (input == "list") {
+            return Pair("list", Location(Bukkit.getWorlds()[0],0.0,0.0,0.0))
+        }
 
         warps.forEach { (warp, loc) ->
-            if (warp === input) {
+            if (warp == input) {
                 return Pair(warp,loc)
             }
         }

src/main/kotlin/com/kruthers/gamemode4core/events/GriefEvents.kt

@@ -12,6 +12,7 @@ import org.bukkit.event.EventHandler
 import org.bukkit.event.Listener
 import org.bukkit.event.block.BlockPlaceEvent
 import org.bukkit.event.entity.EntityPlaceEvent
+import org.bukkit.event.player.PlayerBucketEmptyEvent
 
 class GriefEvents(val plugin: Gamemode4Core): Listener {
     private val warningTime: Int = 60*60*20
@@ -69,4 +70,25 @@ class GriefEvents(val plugin: Gamemode4Core): Listener {
             }
         }
     }
+
+    @EventHandler
+    fun onBucketEmpty(event: PlayerBucketEmptyEvent) {
+
+        if (event.player.getStatistic(Statistic.PLAY_ONE_MINUTE) < (warningTime/2)) {
+            when (event.bucket) {
+                Material.LAVA_BUCKET -> {
+                    event.isCancelled = true
+                    val loc = event.block.location
+                    Bukkit.broadcast(parseString("<staff_prefix> <player> <red>Attempted to place lava " +
+                            "at <u><click:suggest_command:'/tpa l ${loc.x} ${loc.y} ${loc.z}'>" +
+                            "${loc.x} ${loc.y} ${loc.z}</click></u>", event.player, plugin))
+                    kickPlayer(event.player)
+                }
+                else -> {
+                    return
+                }
+            }
+        }
+
+    }
 }