From a5e4646e0aefeabcf7b2d656b099739470ab3823 Mon Sep 17 00:00:00 2001 From: yoyosource Date: Mon, 22 Jul 2024 12:39:39 +0200 Subject: [PATCH] Hotfix 2 messages --- src/de/steamwar/velocitycore/commands/FightCommand.java | 2 +- src/de/steamwar/velocitycore/commands/JoinmeCommand.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/de/steamwar/velocitycore/commands/FightCommand.java b/src/de/steamwar/velocitycore/commands/FightCommand.java index 1d5283ea..633405e8 100644 --- a/src/de/steamwar/velocitycore/commands/FightCommand.java +++ b/src/de/steamwar/velocitycore/commands/FightCommand.java @@ -130,7 +130,7 @@ public class FightCommand extends SWCommand { public void fight(@Validator("arenaPlayer") PlayerChatter sender, @Mapper("nonHistoricArenaMode") @OptionalValue("") @AllowNull ArenaMode arenaMode, @Mapper("arenaMap") @OptionalValue("") @AllowNull String map) { createArena(sender, "/fight ", true, arenaMode, map, false, (p, mode, m) -> new ServerStarter().arena(mode, m).blueLeader(p.getPlayer()).callback( - arena -> Chatter.broadcast().system("FIGHT_BROADCAST", new Message("FIGHT_BROADCAST_HOVER"), ClickEvent.runCommand("/arena " + arena.getServer().getName()), mode.getGameName(), p.getPlayer().getUsername()) + arena -> Chatter.broadcast().system("FIGHT_BROADCAST", new Message("FIGHT_BROADCAST_HOVER", p.getPlayer().getUsername()), ClickEvent.runCommand("/arena " + arena.getServer().getName()), mode.getGameName(), p.getPlayer().getUsername()) ).start() ); } diff --git a/src/de/steamwar/velocitycore/commands/JoinmeCommand.java b/src/de/steamwar/velocitycore/commands/JoinmeCommand.java index f6b4262f..4bab8d11 100644 --- a/src/de/steamwar/velocitycore/commands/JoinmeCommand.java +++ b/src/de/steamwar/velocitycore/commands/JoinmeCommand.java @@ -21,6 +21,7 @@ package de.steamwar.velocitycore.commands; import de.steamwar.command.SWCommand; import de.steamwar.messages.Chatter; +import de.steamwar.messages.Message; import de.steamwar.messages.PlayerChatter; import de.steamwar.sql.UserPerm; import net.kyori.adventure.text.event.ClickEvent; @@ -33,6 +34,6 @@ public class JoinmeCommand extends SWCommand { @Register public void genericCommand(PlayerChatter sender) { - Chatter.broadcast().system("JOINME_BROADCAST", "JOINME_BROADCAST_HOVER", ClickEvent.runCommand("/join " + sender.getPlayer().getUsername()), sender, sender.getPlayer().getCurrentServer().orElseThrow().getServerInfo().getName()); + Chatter.broadcast().system("JOINME_BROADCAST", new Message("JOINME_BROADCAST_HOVER"), ClickEvent.runCommand("/join " + sender.getPlayer().getUsername()), sender, sender.getPlayer().getCurrentServer().orElseThrow().getServerInfo().getName()); } }