SteamWar/BungeeCore
Archiviert
13
2

Fix TablistManager #283

Zusammengeführt
Lixfel hat 5 Commits von FixTablist nach master 2021-12-22 17:09:59 +01:00 zusammengeführt

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,10 +197,11 @@ public class TablistManager extends BasicListener {
@Override
public int slimSize(ProxiedPlayer viewer) {
int size = subTablists.stream().mapToInt(tPart -> viewer == null ? tPart.size() : tPart.slimSize(viewer)).sum();
if(withHeaders)
size += subTablists.size() * 2;
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
@ -210,8 +211,10 @@ public class TablistManager extends BasicListener {
@Override
public void print(Tablist viewer, boolean slim) {
subTablists.forEach(tPart -> {
if(withHeaders)
for (int i = 0; i < subTablists.size(); i++) {
TablistPart tPart = subTablists.get(i);
boolean withoutFooter = i == subTablists.size() - 1;
if (withHeaders) {
if (slim) {
int slimSize = tPart.slimSize(viewer.player);
int size = tPart.size();
@ -219,16 +222,19 @@ 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);
withoutFooter = true;
} else {
viewer.setSlot(gray, "§7§l" + tPart.name() + " §8(§7+" + (size - slimSize) + "§8)", 1000);
}
} else {
viewer.setSlot(gray, "§7§l" + tPart.name(), 1000);
}
}
tPart.print(viewer, slim);
if(withHeaders)
if (withHeaders && !withoutFooter) {
viewer.setSlot(darkGray, "", 1000);
});
}
}
}
}