SteamWar/FightSystem
SteamWar/FightSystem
12
1
Fork 0
Code Issues 6 Pull-Requests Releases Wiki Aktivität

Fixing Scoreboard

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Chaoscaot 2020-10-15 13:14:34 +02:00
Ursprung e575d7a493
Commit 2bc9bded5c
1 geänderte Dateien mit 7 neuen und 8 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

15
FightSystem_Main/src/de/steamwar/fightsystem/utils/FightScoreboard.java
Datei anzeigen

@ -45,7 +45,7 @@ public class FightScoreboard implements Listener {
private static ScoreBoardObjective objective; private static ScoreBoardObjective objective;
public static void init(){ public static void init(){
Bukkit.getScheduler().scheduleSyncRepeatingTask(FightSystem.getPlugin(), () -> nextIndexDisplay(), 0, 200); Bukkit.getScheduler().scheduleSyncRepeatingTask(FightSystem.getPlugin(), FightScoreboard::nextIndexDisplay, 0, 200);
} }
public static Scoreboard getScoreboard() { public static Scoreboard getScoreboard() {
@ -54,7 +54,7 @@ public class FightScoreboard implements Listener {
@EventHandler() @EventHandler()
public void onPlayerJoin(PlayerJoinEvent event) { public void onPlayerJoin(PlayerJoinEvent event) {
SWScoreboard.createScoreboard(event.getPlayer(), new ScoreboardCallback() { SWScoreboard.createScoreboard(event.getPlayer(), new ScoreboardCallback() {
@Override @Override
public HashMap<String, Integer> getData() { public HashMap<String, Integer> getData() {
return objective.getScores(); return objective.getScores();
@ -73,7 +73,7 @@ public class FightScoreboard implements Listener {
} }
private static ScoreBoardObjective teamScoreboard(FightTeam fightTeam){ private static ScoreBoardObjective teamScoreboard(FightTeam fightTeam){
ScoreBoardObjective objective = new ScoreBoardObjective(fightTeam.getColoredName()); final ScoreBoardObjective objective = new ScoreBoardObjective(fightTeam.getColoredName());
fightTeam.getPlayers().forEach(fp -> { fightTeam.getPlayers().forEach(fp -> {
if(fp.isLiving()) if(fp.isLiving())
objective.addScore(fightTeam.getPrefix() + fp.getPlayer().getName(), (int) Math.ceil(fp.getPlayer().getHealth())); objective.addScore(fightTeam.getPrefix() + fp.getPlayer().getName(), (int) Math.ceil(fp.getPlayer().getHealth()));
@ -82,7 +82,7 @@ public class FightScoreboard implements Listener {
} }
private static ScoreBoardObjective generalScoreboard(){ private static ScoreBoardObjective generalScoreboard(){
ScoreBoardObjective objective = new ScoreBoardObjective("§6Kampf"); final ScoreBoardObjective objective = new ScoreBoardObjective("§6Kampf");
if (Config.Timeout || Config.Points || Config.HeartRatioTimeout) { if (Config.Timeout || Config.Points || Config.HeartRatioTimeout) {
int fightTime = FightSystem.getFightTime(); int fightTime = FightSystem.getFightTime();
if (fightTime >= 60) if (fightTime >= 60)
@ -123,9 +123,8 @@ public class FightScoreboard implements Listener {
private static void nextIndexDisplay() { private static void nextIndexDisplay() {
index++; index++;
if(index > 2) if(index > 2)
return; index = 0;
index = 0; final FightTeam team = getIndexDisplay();
FightTeam team = getIndexDisplay();
if(team != null) if(team != null)
objective = teamScoreboard(team); objective = teamScoreboard(team);
else else
@ -135,7 +134,7 @@ public class FightScoreboard implements Listener {
private static class ScoreBoardObjective { private static class ScoreBoardObjective {
private final String title; private final String title;
private HashMap<String, Integer> scores = new HashMap<>(); private final HashMap<String, Integer> scores = new HashMap<>();
public ScoreBoardObjective(String title) { public ScoreBoardObjective(String title) {
this.title = title; this.title = title;