SteamWar/BauSystem2.0
SteamWar/BauSystem2.0
Archiviert
12
0
Fork 0
Code Issues 39 Pull-Requests Projekte Releases Wiki Aktivität

Fix BauScoreboard
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details

Quellcode durchsuchen
Dieser Commit ist enthalten in:
yoyosource 2024-03-05 12:21:11 +01:00
Ursprung 3ecd31e80c
Commit 2ccc7920d5
1 geänderte Dateien mit 9 neuen und 9 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

18
BauSystem_Main/src/de/steamwar/bausystem/features/world/BauScoreboard.java
Datei anzeigen

@ -53,7 +53,7 @@ public class BauScoreboard implements Listener {
Region region = Region.getRegion(player.getLocation()); Region region = Region.getRegion(player.getLocation());
List<String> elements = new ArrayList<>(); List<String> elements = new ArrayList<>();
calcGroup(elements, "§0", region, ScoreboardElement.ScoreboardGroup.HEADER); calcGroup(elements, null, region, ScoreboardElement.ScoreboardGroup.HEADER);
calcGroup(elements, "§1", region, ScoreboardElement.ScoreboardGroup.REGION); calcGroup(elements, "§1", region, ScoreboardElement.ScoreboardGroup.REGION);
calcGroup(elements, "§2", region, ScoreboardElement.ScoreboardGroup.OTHER); calcGroup(elements, "§2", region, ScoreboardElement.ScoreboardGroup.OTHER);
calcGroup(elements, "§3", region, ScoreboardElement.ScoreboardGroup.FOOTER); calcGroup(elements, "§3", region, ScoreboardElement.ScoreboardGroup.FOOTER);
@ -67,26 +67,26 @@ public class BauScoreboard implements Listener {
} }
private void calcGroup(List<String> elements, String separator, Region region, ScoreboardElement.ScoreboardGroup group) { private void calcGroup(List<String> elements, String separator, Region region, ScoreboardElement.ScoreboardGroup group) {
List<String> groupElements = new ArrayList<>();
if (ELEMENTS.containsKey(group)) { if (ELEMENTS.containsKey(group)) {
List<String> groupElements = new ArrayList<>();
for (ScoreboardElement element : ELEMENTS.get(group)) { for (ScoreboardElement element : ELEMENTS.get(group)) {
groupElements.add(element.get(region, player)); groupElements.add(element.get(region, player));
} }
groupElements.removeIf(Objects::isNull);
if (!groupElements.isEmpty()) {
elements.add(separator);
elements.addAll(groupElements);
}
} }
if (ADDITIONAL_SCOREBOARD_LINES.containsKey(player)) { if (ADDITIONAL_SCOREBOARD_LINES.containsKey(player)) {
ADDITIONAL_SCOREBOARD_LINES.get(player).values() ADDITIONAL_SCOREBOARD_LINES.get(player).values()
.stream() .stream()
.filter(triple -> triple.getLeft() == group) .filter(triple -> triple.getLeft() == group)
.sorted(Comparator.comparing(triple -> triple.getMiddle())) .sorted(Comparator.comparing(MutableTriple::getMiddle))
.forEach(triple -> { .forEach(triple -> {
elements.add(triple.getRight()); groupElements.add(triple.getRight());
}); });
} }
groupElements.removeIf(Objects::isNull);
if (!groupElements.isEmpty()) {
if (separator != null) elements.add(separator);
elements.addAll(groupElements);
}
} }
@Override @Override