Chaoscaot/VelocityCore
Archiviert
1
0
Fork 0
geforkt von SteamWar/BungeeCore
Code Pull-Requests Aktivität

Simplify code

Quellcode durchsuchen 
Signed-off-by: Lixfel <agga-games@gmx.de>
Dieser Commit ist enthalten in:
Lixfel 2021-12-22 17:09:16 +01:00
Ursprung 6e6cf76479
Commit 39c7254963
1 geänderte Dateien mit 9 neuen und 21 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

30
src/de/steamwar/bungeecore/listeners/TablistManager.java
Datei anzeigen

@ -103,7 +103,7 @@ public class TablistManager extends BasicListener {
if(bau.size() > 0)
tablist.addSubTablist(bau);
size = (int) Math.ceil(tablist.size() / 20.0);
size = (int) Math.ceil((tablist.size() - 1) / 20.0);
tablists.values().forEach(Tablist::refresh);
seconds++;
}
@ -197,23 +197,11 @@ public class TablistManager extends BasicListener {
@Override
public int slimSize(ProxiedPlayer viewer) {
int size = 0;
for (int i = 0; i < subTablists.size(); i++) {
TablistPart tablistPart = subTablists.get(i);
boolean removeFooter = i == subTablists.size() - 1;
if (viewer == null) {
size += tablistPart.size();
} else {
int slimSize = tablistPart.slimSize(viewer);
size += slimSize;
if (slimSize == 0) removeFooter = true;
}
if (withHeaders) {
size += 2; // The 2 is for the header and footer
if (removeFooter) size--; // The last one has no footer
}
}
return size;
return subTablists.stream().mapToInt(tPart -> viewer == null ? tPart.size() : tPart.slimSize(viewer)).map(size -> {
size += withHeaders ? 1 : 0; // Space for header
size += withHeaders && size > 1 ? 1 : 0; // Space for footer
return size;
}).sum();
}
@Override
@ -225,7 +213,7 @@ public class TablistManager extends BasicListener {
public void print(Tablist viewer, boolean slim) {
for (int i = 0; i < subTablists.size(); i++) {
TablistPart tPart = subTablists.get(i);
boolean removeFooter = i == subTablists.size() - 1;
boolean withoutFooter = i == subTablists.size() - 1;
if (withHeaders) {
if (slim) {
int slimSize = tPart.slimSize(viewer.player);
@ -234,7 +222,7 @@ public class TablistManager extends BasicListener {
viewer.setSlot(gray, "§7§l" + tPart.name(), 1000);
} else if (slimSize == 0) {
viewer.setSlot(gray, "§7§l" + tPart.name() + " §8(§7" + size + "§8)", 1000);
removeFooter = true;
withoutFooter = true;
} else {
viewer.setSlot(gray, "§7§l" + tPart.name() + " §8(§7+" + (size - slimSize) + "§8)", 1000);
}
@ -243,7 +231,7 @@ public class TablistManager extends BasicListener {
}
}
tPart.print(viewer, slim);
if (withHeaders && !removeFooter) {
if (withHeaders && !withoutFooter) {
viewer.setSlot(darkGray, "", 1000);
}
}