forked from Upstream/Velocitab
Added a team exists check when vanishing/unvanishing a player (#110)
This commit is contained in:
parent
e22dc45a21
commit
7005ceccd7
@ -86,6 +86,12 @@ public class ScoreboardManager {
|
|||||||
|
|
||||||
final RegisteredServer serverInfo = optionalServerConnection.get().getServer();
|
final RegisteredServer serverInfo = optionalServerConnection.get().getServer();
|
||||||
final List<RegisteredServer> siblings = plugin.getTabList().getGroupServers(serverInfo.getServerInfo().getName());
|
final List<RegisteredServer> siblings = plugin.getTabList().getGroupServers(serverInfo.getServerInfo().getName());
|
||||||
|
|
||||||
|
final String teamName = createdTeams.get(player.getUniqueId());
|
||||||
|
if (teamName == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
UpdateTeamsPacket packet = UpdateTeamsPacket.removeTeam(plugin, createdTeams.get(player.getUniqueId()));
|
UpdateTeamsPacket packet = UpdateTeamsPacket.removeTeam(plugin, createdTeams.get(player.getUniqueId()));
|
||||||
|
|
||||||
siblings.forEach(server -> server.getPlayersConnected().forEach(connected -> {
|
siblings.forEach(server -> server.getPlayersConnected().forEach(connected -> {
|
||||||
@ -113,12 +119,12 @@ public class ScoreboardManager {
|
|||||||
final RegisteredServer serverInfo = optionalServerConnection.get().getServer();
|
final RegisteredServer serverInfo = optionalServerConnection.get().getServer();
|
||||||
final List<RegisteredServer> siblings = plugin.getTabList().getGroupServers(serverInfo.getServerInfo().getName());
|
final List<RegisteredServer> siblings = plugin.getTabList().getGroupServers(serverInfo.getServerInfo().getName());
|
||||||
|
|
||||||
final String role = createdTeams.getOrDefault(player.getUniqueId(), "");
|
final String teamName = createdTeams.get(player.getUniqueId());
|
||||||
if (role.isEmpty()) {
|
if (teamName == null) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
final String nametag = nametags.getOrDefault(role, "");
|
final String nametag = nametags.getOrDefault(teamName, "");
|
||||||
if (nametag.isEmpty()) {
|
if (nametag.isEmpty()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user