Rework chat into Velocity-managed channels

- Subservers no longer receive chat; arenas get a record-only ChatRecordPacket so replays keep their chat
This commit is contained in:
2026-10-19 09:37:24 +02:00
parent cab5ab8cc8
commit 917a1b1c7c
2 changed files with 21 additions and 34 deletions
@@ -243,10 +243,6 @@ public class FightTeam {
broadcast(player -> FightSystem.getMessage().send(message, player, params)); broadcast(player -> FightSystem.getMessage().send(message, player, params));
} }
public void broadcastChat(Player sender, String message) {
broadcast(player -> FightSystem.getMessage().sendPrefixless("TEAM_CHAT", player, ChatMessageType.CHAT, prefix, sender.getName(), message));
}
private void broadcast(Consumer<Player> f) { private void broadcast(Consumer<Player> f) {
players.forEach((uuid, fightPlayer) -> { players.forEach((uuid, fightPlayer) -> {
Player player = Bukkit.getPlayer(uuid); Player player = Bukkit.getPlayer(uuid);
@@ -19,50 +19,41 @@
package de.steamwar.fightsystem.listener; package de.steamwar.fightsystem.listener;
import de.steamwar.fightsystem.ArenaMode;
import de.steamwar.fightsystem.Config; import de.steamwar.fightsystem.Config;
import de.steamwar.fightsystem.FightSystem; import de.steamwar.fightsystem.FightSystem;
import de.steamwar.fightsystem.fight.Fight; import de.steamwar.fightsystem.fight.Fight;
import de.steamwar.fightsystem.fight.FightTeam; import de.steamwar.fightsystem.fight.FightTeam;
import de.steamwar.fightsystem.record.GlobalRecorder; import de.steamwar.fightsystem.record.GlobalRecorder;
import de.steamwar.fightsystem.states.FightState;
import de.steamwar.fightsystem.states.StateDependentListener;
import de.steamwar.linkage.Linked; import de.steamwar.linkage.Linked;
import de.steamwar.network.packets.PacketHandler;
import de.steamwar.network.packets.server.ChatRecordPacket;
import de.steamwar.sql.SteamwarUser;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.AsyncPlayerChatEvent;
import java.util.logging.Level; import java.util.logging.Level;
/**
* Chat is handled by Velocity. Messages written on this server are only sent here to be recorded for the replay.
*/
@Linked @Linked
public class Chat implements Listener { public class Chat extends PacketHandler {
public Chat(){ @Handler
new StateDependentListener(ArenaMode.All, FightState.All, this); public void handleChatRecord(ChatRecordPacket packet) {
} SteamwarUser user = SteamwarUser.byId(packet.getPlayerId());
String message = packet.getMessage();
FightSystem.getPlugin().getLogger().log(Level.INFO, user.getUserName() + "» " + message);
@EventHandler Player player = Bukkit.getPlayer(user.getUUID());
public void handlePlayerChat(AsyncPlayerChatEvent event) { FightTeam fightTeam = player != null ? Fight.getPlayerTeam(player) : null;
Player player = event.getPlayer(); if (fightTeam != null) {
String message = event.getMessage(); GlobalRecorder.getInstance().chat("PARTICIPANT_CHAT", fightTeam.getColoredName(), user.getUserName(), message);
} else if (player != null && Config.isReferee(player)) {
FightSystem.getPlugin().getLogger().log(Level.INFO, player.getName() + "» " + message); GlobalRecorder.getInstance().chat("FIGHTLEADER_CHAT", user.getUserName(), message);
FightTeam fightTeam = Fight.getPlayerTeam(player);
if(fightTeam != null) {
String teamName = fightTeam.getColoredName();
if(message.startsWith(Config.GameModeConfig.TeamChatPrefix)) {
fightTeam.broadcastChat(player, message.substring(1));
} else { } else {
broadcastChat("PARTICIPANT_CHAT", teamName, player.getName(), message); GlobalRecorder.getInstance().chat("SPECTATOR_CHAT", user.getUserName(), message);
} }
}else if(Config.isReferee(player)){
broadcastChat("FIGHTLEADER_CHAT", player.getName(), message);
}else{
broadcastChat("SPECTATOR_CHAT", player.getName(), message);
}
event.setCancelled(true);
} }
public static void broadcastChat(String message, Object... params) { public static void broadcastChat(String message, Object... params) {