Revert "Update Message"

This reverts commit ac9197c554.
2024-11-14 22:18:34 +01:00
parent 26f15304a2
commit 9dff1f5884
13 changed files with 107 additions and 105 deletions
@@ -21,17 +21,16 @@ import org.bukkit.event.player.PlayerRespawnEvent

 object GlobalListener: Listener {

-    @EventHandler(priority = EventPriority.HIGH)
+    @EventHandler(priority = EventPriority.LOW)
    fun onPlayerJoin(e: PlayerJoinEvent) {
        e.joinMessage(null)
        with(e.player) {
            teleport(TNTLeagueWorldConfig.lobby)
            inventory.clear()
-            plugin.server.broadcast(translate("join", this, name.bold()).basic())
+            plugin.server.broadcast(translate("join", name.bold()).basic())
            isOp = false
            gameMode = GameMode.SPECTATOR
            respawnLocation = TNTLeagueWorldConfig.lobby
-            println(locale())
        }
    }

@@ -79,4 +78,11 @@ object GlobalListener: Listener {
            null -> e.respawnLocation = TNTLeagueWorldConfig.lobby
        }
    }
+
+    @EventHandler
+    fun onChat(e: AsyncChatEvent) {
+        e.renderer { source, sourceDisplayName, message, _ ->
+            translate("chat", sourceDisplayName.colorByTeam(TNTLeagueGame.getTeam(source)), message).basic()
+        }
+    }
 }
@@ -26,7 +26,7 @@ object IngameListener: Listener {
    fun onEntityInteract(e: PlayerInteractEntityEvent) {
        if (e.player.gameMode == GameMode.SPECTATOR) return

-        if(e.rightClicked.type == EntityType.WANDERING_TRADER) {
+        if(e.rightClicked.type == EntityType.VILLAGER) {
            e.isCancelled = true
            e.player.openInventory(DealerInventory(e.player).getInventory())
        }
@@ -20,7 +20,7 @@ import org.bukkit.event.player.PlayerQuitEvent

 object LobbyListener: Listener {

-    @EventHandler(priority = EventPriority.HIGHEST)
+    @EventHandler
    fun onPlayerJoin(e: PlayerJoinEvent) {
        TNTLeagueGame.getFreeTeam()?.run {
            join(e.player)