Improve the scoreboard

This commit is contained in:
Sam 2018-01-09 22:00:11 +00:00 committed by Alexander Meech
parent 4367629898
commit 5252d79c5f
3 changed files with 7 additions and 20 deletions

View File

@ -396,15 +396,9 @@ public abstract class Skywars extends Game
{
if (IsLive())
{
long timeUtilCrumble = _mapCrumbleModule.getTimeUntilCrumble();
long timeUtilTNT = _generatorModule.getGenerators().get(0).getTimeUtilSpawn();
if (timeUtilCrumble > 0)
{
Scoreboard.write(C.cGreenB + "Map Crumble");
Scoreboard.write(UtilTime.MakeStr(timeUtilCrumble));
Scoreboard.writeNewLine();
}
Scoreboard.writeNewLine();
Scoreboard.write(C.cGreenB + "Throwable TNT");

View File

@ -102,7 +102,7 @@ public class SoloSkywars extends Skywars
Scoreboard.writeNewLine();
Scoreboard.write(C.cYellow + C.Bold + "Players");
if (team.GetPlayers(true).size() > 4)
if (team.GetPlayers(true).size() > 10)
{
Scoreboard.write("" + team.GetPlayers(true).size());
}
@ -114,8 +114,6 @@ public class SoloSkywars extends Skywars
}
}
Scoreboard.writeNewLine();
writeScoreboard();
Scoreboard.draw();

View File

@ -76,16 +76,13 @@ public class TeamSkywars extends Skywars
@EventHandler
public void ScoreboardUpdate(UpdateEvent event)
{
if (event.getType() != UpdateType.FAST)
if (event.getType() != UpdateType.FAST || !InProgress())
{
return;
if (GetTeamList().isEmpty())
return;
Scoreboard.reset();
}
Scoreboard.writeNewLine();
Scoreboard.write(C.cYellow + C.Bold + "Teams");
Scoreboard.write(C.cYellowB + "Teams");
List<GameTeam> alive = new ArrayList<>();
for (GameTeam team : GetTeamList())
@ -96,7 +93,7 @@ public class TeamSkywars extends Skywars
}
}
if (GetPlayers(true).size() <= 4)
if (GetPlayers(true).size() <= 10)
{
for (GameTeam team : GetTeamList())
{
@ -118,8 +115,6 @@ public class TeamSkywars extends Skywars
Scoreboard.write(C.cWhite + alive.size() + " Alive");
}
Scoreboard.writeNewLine();
writeScoreboard();
Scoreboard.draw();