From b5a49fb1092ae4d8c5579ce611ef33ec829c36f9 Mon Sep 17 00:00:00 2001 From: yoyosource Date: Wed, 17 Jul 2024 11:55:57 +0200 Subject: [PATCH 1/2] Add Color codes to local chat --- src/de/steamwar/velocitycore/listeners/ChatListener.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/de/steamwar/velocitycore/listeners/ChatListener.java b/src/de/steamwar/velocitycore/listeners/ChatListener.java index 74429c1..eb35fe4 100644 --- a/src/de/steamwar/velocitycore/listeners/ChatListener.java +++ b/src/de/steamwar/velocitycore/listeners/ChatListener.java @@ -169,10 +169,11 @@ public class ChatListener extends BasicListener { if(ChatListener.filteredCommand(sender, message)) return; - if(!message.startsWith("/") && chatFilter(sender, message)) + final String coloredMessage = sender.user().hasPerm(UserPerm.COLOR_CHAT) ? message.replace('&', 'ยง') : message; + if(!message.startsWith("/") && chatFilter(sender, coloredMessage)) return; - sender.getPlayer().spoofChatInput(message); + sender.getPlayer().spoofChatInput(coloredMessage); } private static boolean chatFilter(Chatter sender, String message) { -- 2.39.2 From f38bbcdfd09a973a6e108267e3ad9a871cff4868 Mon Sep 17 00:00:00 2001 From: yoyosource Date: Mon, 22 Jul 2024 12:39:39 +0200 Subject: [PATCH 2/2] 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 1d5283e..633405e 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 f6b4262..4bab8d1 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()); } } -- 2.39.2