From 2bc12730ea9066b4ee02c68470f61744df51bdae Mon Sep 17 00:00:00 2001
From: Yaruma3341 <yaruma3341@gmail.com>
Date: Sat, 23 Feb 2019 13:17:44 +0100
Subject: [PATCH] Not stable version

Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
---
 src/me/yaruma/fightsystem/FightSystem.java     |  5 +++++
 src/me/yaruma/fightsystem/fight/FightTeam.java | 18 ++++++++++++++++++
 .../fightsystem/manager/FileManager.java       |  2 +-
 .../utils/scoreboard/Scoreboard.java           | 16 ++--------------
 4 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/src/me/yaruma/fightsystem/FightSystem.java b/src/me/yaruma/fightsystem/FightSystem.java
index 11c6745..a228a17 100644
--- a/src/me/yaruma/fightsystem/FightSystem.java
+++ b/src/me/yaruma/fightsystem/FightSystem.java
@@ -74,6 +74,11 @@ public class FightSystem extends JavaPlugin {
         this.fightManager = new FightManager();
         this.scoreboard = new Scoreboard(plugin);
 
+        Fight.getRedTeam().setName(fileManager.getStringFromConfig("Output.TeamRedName"));
+        Fight.getRedTeam().setPrefix(fileManager.getStringFromConfig("Output.TeamRedColor"));
+        Fight.getBlueTeam().setPrefix(fileManager.getStringFromConfig("Output.TeamBlueName"));
+        Fight.getBlueTeam().setPrefix(fileManager.getStringFromConfig("Output.TeamBlueColor"));
+
         //Load config
         schemsizeX = fileManager.getIntegerFromConfig("Arena.Schemsize.x");
         schemsizeY = fileManager.getIntegerFromConfig("Arena.Schemsize.y");
diff --git a/src/me/yaruma/fightsystem/fight/FightTeam.java b/src/me/yaruma/fightsystem/fight/FightTeam.java
index c70e7fc..8227faf 100644
--- a/src/me/yaruma/fightsystem/fight/FightTeam.java
+++ b/src/me/yaruma/fightsystem/fight/FightTeam.java
@@ -18,6 +18,8 @@ public class FightTeam {
     private FightSystem plugin;
     private boolean ready;
     private ArrayList<Player> invited;
+    private String name;
+    private String prefix;
 
     public FightTeam(Player leader, FightSystem plugin) {
         this.plugin = plugin;
@@ -173,4 +175,20 @@ public class FightTeam {
     public void setInvited(ArrayList<Player> invited) {
         this.invited = invited;
     }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getPrefix() {
+        return prefix;
+    }
+
+    public void setPrefix(String prefix) {
+        this.prefix = prefix;
+    }
 }
diff --git a/src/me/yaruma/fightsystem/manager/FileManager.java b/src/me/yaruma/fightsystem/manager/FileManager.java
index ca4b6be..a0aa5f4 100644
--- a/src/me/yaruma/fightsystem/manager/FileManager.java
+++ b/src/me/yaruma/fightsystem/manager/FileManager.java
@@ -19,7 +19,7 @@ public class FileManager
         this.config = instance.getConfig();
         this.config.options().copyDefaults(true);
         this.file = new File(instance.getDataFolder(), "config.yml");
-        instance.saveConfig();
+        //instance.saveConfig();
     }
 
     public void reloadFiles(FightSystem instance) {
diff --git a/src/me/yaruma/fightsystem/utils/scoreboard/Scoreboard.java b/src/me/yaruma/fightsystem/utils/scoreboard/Scoreboard.java
index 50a5610..9e5db5b 100644
--- a/src/me/yaruma/fightsystem/utils/scoreboard/Scoreboard.java
+++ b/src/me/yaruma/fightsystem/utils/scoreboard/Scoreboard.java
@@ -28,27 +28,15 @@ public class Scoreboard {
 
             private int index;
 
-            private String PREFIX;
-            private String NAME;
-
             @Override
             public void run() {
                 if(getIndexDisplay(index) != null) {
 
-                    if(getIndexDisplay(index) == Fight.redTeam) {
-                        this.PREFIX = FightSystem.getPlugin().getFileManager().getStringFromConfig("Output.TeamRedColor");
-                        this.NAME = FightSystem.getPlugin().getFileManager().getStringFromConfig("Output.TeamRedName");
-                    }
-                    if(getIndexDisplay(index) == Fight.blueTeam) {
-                        this.PREFIX = FightSystem.getPlugin().getFileManager().getStringFromConfig("Output.TeamBlueColor");
-                        this.NAME = FightSystem.getPlugin().getFileManager().getStringFromConfig("Output.TeamBlueName");
-                    }
-
                     objective.setDisplaySlot(DisplaySlot.SIDEBAR);
-                    objective.setDisplayName("§6Info " + PREFIX + NAME);
+                    objective.setDisplayName("§6Info " + getIndexDisplay(index).getPrefix() + getIndexDisplay(index).getName());
 
                     for(int i = 0; i < getIndexDisplay(index).getPlayers().size(); i++) {
-                        objective.getScore(PREFIX + getIndexDisplay(index).getPlayers().get(i).getPlayer().getDisplayName() + " §8: " + "§6" + getIndexDisplay(index).getPlayers().get(i).getPlayer().getHealth()).setScore(i);
+                        objective.getScore(getIndexDisplay(index).getPrefix() + getIndexDisplay(index).getPlayers().get(i).getPlayer().getDisplayName() + " §8: " + "§6" + getIndexDisplay(index).getPlayers().get(i).getPlayer().getHealth()).setScore(i);
                     }
 
                 } else {