Update Message

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

@@ -21,16 +21,17 @@ import org.bukkit.event.player.PlayerRespawnEvent
 
 object GlobalListener: Listener {
 
-    @EventHandler(priority = EventPriority.LOW)
+    @EventHandler(priority = EventPriority.HIGH)
     fun onPlayerJoin(e: PlayerJoinEvent) {
         e.joinMessage(null)
         with(e.player) {
             teleport(TNTLeagueWorldConfig.lobby)
             inventory.clear()
-            plugin.server.broadcast(translate("join", name.bold()).basic())
+            plugin.server.broadcast(translate("join", this, name.bold()).basic())
             isOp = false
             gameMode = GameMode.SPECTATOR
             respawnLocation = TNTLeagueWorldConfig.lobby
+            println(locale())
         }
     }
 
@@ -78,11 +79,4 @@ 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()
-        }
-    }
 }

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

@@ -26,7 +26,7 @@ object IngameListener: Listener {
     fun onEntityInteract(e: PlayerInteractEntityEvent) {
         if (e.player.gameMode == GameMode.SPECTATOR) return
 
-        if(e.rightClicked.type == EntityType.VILLAGER) {
+        if(e.rightClicked.type == EntityType.WANDERING_TRADER) {
             e.isCancelled = true
             e.player.openInventory(DealerInventory(e.player).getInventory())
         }

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

@@ -20,7 +20,7 @@ import org.bukkit.event.player.PlayerQuitEvent
 
 object LobbyListener: Listener {
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.HIGHEST)
     fun onPlayerJoin(e: PlayerJoinEvent) {
         TNTLeagueGame.getFreeTeam()?.run {
             join(e.player)