From ff9491e4efc8755f0781bb9ea6391096c42fd8c4 Mon Sep 17 00:00:00 2001 From: lixfel Date: Sat, 23 Feb 2019 13:31:26 +0100 Subject: [PATCH] Changed Chat --- .../listener/PlayerChatListener.java | 30 ++++++++----------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/src/me/yaruma/fightsystem/listener/PlayerChatListener.java b/src/me/yaruma/fightsystem/listener/PlayerChatListener.java index 5d7cb1b..b40968f 100644 --- a/src/me/yaruma/fightsystem/listener/PlayerChatListener.java +++ b/src/me/yaruma/fightsystem/listener/PlayerChatListener.java @@ -21,25 +21,21 @@ public class PlayerChatListener implements Listener { String teamChatDetection = fileManager.getStringFromConfig("Output.TeamChatDetection"); - event.setCancelled(true); + FightTeam fightTeam = Fight.getPlayerTeam(player); - if(message.startsWith(teamChatDetection)) { - FightTeam fightTeam = Fight.getPlayerTeam(player); - if(fightTeam != null) fightTeam.broadcast("§5" + player.getName() + "§e--> §2" + message); - } else { - FightTeam fightTeam = Fight.getPlayerTeam(player); - if(fightTeam == Fight.redTeam) { - String prefixColorCode = fileManager.getStringFromConfig("Output.TeamRedColor"); - String teamName = fileManager.getStringFromConfig("Output.TeamRedName"); - Bukkit.broadcastMessage(prefixColorCode + teamName + " " + player.getName() + " §8>> " + prefixColorCode + message); - } - if(fightTeam == Fight.blueTeam) { - String prefixColorCode = fileManager.getStringFromConfig("Output.TeamBlueColor"); - String teamName = fileManager.getStringFromConfig("Output.TeamBlueName"); - Bukkit.broadcastMessage(prefixColorCode + teamName + " " + player.getName() + " §8>> " + prefixColorCode + message); + if(fightTeam != null){ + String prefixColorCode = fightTeam.getPrefix(); + String teamName = fightTeam.getName(); + if(message.startsWith(teamChatDetection)){ + fightTeam.broadcast(prefixColorCode + player.getName() + "» " + prefixColorCode + message); + } else { + Bukkit.broadcastMessage(prefixColorCode + teamName + " " + player.getName() + " §8» " + message); } + }else{ + Bukkit.broadcastMessage(player.getName() + " §8» " + message); } + + event.setCancelled(true); } - - + }