From 7005ceccd7f2dbde41dc34ea263fea0353de8a5b Mon Sep 17 00:00:00 2001 From: AlexDev_ <56083016+alexdev03@users.noreply.github.com> Date: Wed, 25 Oct 2023 19:54:01 +0200 Subject: [PATCH] Added a team exists check when vanishing/unvanishing a player (#110) --- .../velocitab/packet/ScoreboardManager.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/william278/velocitab/packet/ScoreboardManager.java b/src/main/java/net/william278/velocitab/packet/ScoreboardManager.java index f207a07..bcbeb25 100644 --- a/src/main/java/net/william278/velocitab/packet/ScoreboardManager.java +++ b/src/main/java/net/william278/velocitab/packet/ScoreboardManager.java @@ -86,6 +86,12 @@ public class ScoreboardManager { final RegisteredServer serverInfo = optionalServerConnection.get().getServer(); final List 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())); siblings.forEach(server -> server.getPlayersConnected().forEach(connected -> { @@ -113,12 +119,12 @@ public class ScoreboardManager { final RegisteredServer serverInfo = optionalServerConnection.get().getServer(); final List siblings = plugin.getTabList().getGroupServers(serverInfo.getServerInfo().getName()); - final String role = createdTeams.getOrDefault(player.getUniqueId(), ""); - if (role.isEmpty()) { + final String teamName = createdTeams.get(player.getUniqueId()); + if (teamName == null) { return; } - final String nametag = nametags.getOrDefault(role, ""); + final String nametag = nametags.getOrDefault(teamName, ""); if (nametag.isEmpty()) { return; }