SteamWar/BungeeCore
Archiviert
13
2

Update TablistManager

Dieser Commit ist enthalten in:
yoyosource 2021-06-25 15:31:29 +02:00
Ursprung f2ba19da71
Commit edbaddbee6

Datei anzeigen

@ -176,7 +176,7 @@ public class TablistManager extends BasicListener {
i++; i++;
for (ProxiedPlayer p : playerMap.get(server)){ for (ProxiedPlayer p : playerMap.get(server)){
boolean sameServer = currentServer == p.getServer().getInfo(); boolean sameServer = currentServer == p.getServer().getInfo();
setSlot(i % 20, i / 20, BungeeTabListPlusAPI.getIconFromPlayer(p), getTablistName(p, sameServer), (sameServer ? 1 : 500)); setSlot(i % 20, i / 20, BungeeTabListPlusAPI.getIconFromPlayer(p), getTablistName(p), (sameServer ? 1 : 500));
i++; i++;
} }
} }
@ -225,7 +225,7 @@ public class TablistManager extends BasicListener {
i++; i++;
for (ProxiedPlayer p : players){ for (ProxiedPlayer p : players){
boolean sameServer = currentServer == p.getServer().getInfo(); boolean sameServer = currentServer == p.getServer().getInfo();
setSlot(i % 20, i / 20, BungeeTabListPlusAPI.getIconFromPlayer(p), getTablistName(p, sameServer), (sameServer ? 1 : 500)); setSlot(i % 20, i / 20, BungeeTabListPlusAPI.getIconFromPlayer(p), getTablistName(p), (sameServer ? 1 : 500));
i++; i++;
} }
} }
@ -245,7 +245,7 @@ public class TablistManager extends BasicListener {
return team.getTeamId() <= 0 ? null : team; return team.getTeamId() <= 0 ? null : team;
} }
private String getTablistName(ProxiedPlayer p, boolean sameServer) { private String getTablistName(ProxiedPlayer p) {
Subserver server = Subserver.getSubserver(p); Subserver server = Subserver.getSubserver(p);
if(server != null){ if(server != null){
String tablistName = server.getTablistNames().get(p); String tablistName = server.getTablistNames().get(p);
@ -256,13 +256,14 @@ public class TablistManager extends BasicListener {
StringBuilder st = new StringBuilder(); StringBuilder st = new StringBuilder();
UserGroup group = SteamwarUser.get(p).getUserGroup(); UserGroup group = SteamwarUser.get(p).getUserGroup();
//else st.append("§7"); if (group == UserGroup.Member) {
if(group == UserGroup.Member && sameServer) Team team = getTeam(player);
st.append("§f"); if (team != null && team == getTeam(p)) st.append("§f");
else else st.append("§7");
} else {
st.append(group.getColorCode()); st.append(group.getColorCode());
}
// if (!sameServer) st.append("§o");
return st.append(p.getName()).toString(); return st.append(p.getName()).toString();
} }
} }