Merge branch 'chatRework' into 'master'

Changed Chat

See merge request Yaruma3341/fightsystem!4

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);
-
-        if(message.startsWith(teamChatDetection)) {
         FightTeam fightTeam = Fight.getPlayerTeam(player);
-            if(fightTeam != null) fightTeam.broadcast("§5" + player.getName() + "§e--> §2" + message);
+
+        if(fightTeam != null){
+            String prefixColorCode = fightTeam.getPrefix();
+            String teamName = fightTeam.getName();
+            if(message.startsWith(teamChatDetection)){
+                fightTeam.broadcast(prefixColorCode + player.getName() + "» " + prefixColorCode + message);
             } else {
-            FightTeam fightTeam = Fight.getPlayerTeam(player);
+                Bukkit.broadcastMessage(prefixColorCode + teamName + " " + player.getName() + " §8» " + message);
-            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);
-            }
             }
+        }else{
+            Bukkit.broadcastMessage(player.getName() + " §8» " + message);
         }
 
+        event.setCancelled(true);
+    }
     
 }