Update ScoreboardManager to Java 8 lambdas and method references.
Just makes things a little bit neater.
This commit is contained in:
@@ -103,11 +103,7 @@ public class ScoreboardManager {
|
|||||||
final Score fake = kills.getScore(name);
|
final Score fake = kills.getScore(name);
|
||||||
if (value == 0) {
|
if (value == 0) {
|
||||||
fake.setScore(8);
|
fake.setScore(8);
|
||||||
arena.scheduleTask(new Runnable() {
|
arena.scheduleTask(() -> fake.setScore(0), 1);
|
||||||
public void run() {
|
|
||||||
fake.setScore(0);
|
|
||||||
}
|
|
||||||
}, 1);
|
|
||||||
} else {
|
} else {
|
||||||
fake.setScore(value);
|
fake.setScore(value);
|
||||||
}
|
}
|
||||||
@@ -131,13 +127,7 @@ public class ScoreboardManager {
|
|||||||
* It is necessary to delay the reset of the player scores, and the
|
* It is necessary to delay the reset of the player scores, and the
|
||||||
* reset is necessary because of non-zero crappiness. */
|
* reset is necessary because of non-zero crappiness. */
|
||||||
resetKills();
|
resetKills();
|
||||||
arena.scheduleTask(new Runnable() {
|
arena.scheduleTask(this::resetPlayerScores, 1);
|
||||||
public void run() {
|
|
||||||
for (Player p : arena.getPlayersInArena()) {
|
|
||||||
kills.getScore(p.getName()).setScore(0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}, 1);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void resetKills() {
|
private void resetKills() {
|
||||||
@@ -149,6 +139,13 @@ public class ScoreboardManager {
|
|||||||
updateWave(0);
|
updateWave(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void resetPlayerScores() {
|
||||||
|
arena.getPlayersInArena().stream()
|
||||||
|
.map(Player::getName)
|
||||||
|
.map(kills::getScore)
|
||||||
|
.forEach(score -> score.setScore(0));
|
||||||
|
}
|
||||||
|
|
||||||
static class NullScoreboardManager extends ScoreboardManager {
|
static class NullScoreboardManager extends ScoreboardManager {
|
||||||
NullScoreboardManager(Arena arena) {
|
NullScoreboardManager(Arena arena) {
|
||||||
super(arena);
|
super(arena);
|
||||||
|
|||||||
Reference in New Issue
Block a user