From 3d8bdbea49698a7718e6e4be2feb84560efb6cf1 Mon Sep 17 00:00:00 2001
From: AlexDev_ <alessandrodalfovo2003@gmail.com>
Date: Sun, 15 Oct 2023 13:45:37 +0200
Subject: [PATCH] Merged

---
 src/main/java/net/william278/velocitab/Velocitab.java          | 3 +--
 .../net/william278/velocitab/packet/ScoreboardManager.java     | 2 +-
 src/main/java/net/william278/velocitab/tab/PlayerTabList.java  | 1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/net/william278/velocitab/Velocitab.java b/src/main/java/net/william278/velocitab/Velocitab.java
index 33b43f8..31cd3ad 100644
--- a/src/main/java/net/william278/velocitab/Velocitab.java
+++ b/src/main/java/net/william278/velocitab/Velocitab.java
@@ -45,8 +45,8 @@ import net.william278.velocitab.hook.PAPIProxyBridgeHook;
 import net.william278.velocitab.packet.ScoreboardManager;
 import net.william278.velocitab.player.Role;
 import net.william278.velocitab.player.TabPlayer;
-import net.william278.velocitab.sorting.SortingManager;
 import net.william278.velocitab.tab.PlayerTabList;
+import net.william278.velocitab.vanish.VanishManager;
 import org.bstats.charts.SimplePie;
 import org.bstats.velocity.Metrics;
 import org.jetbrains.annotations.NotNull;
@@ -75,7 +75,6 @@ public class Velocitab {
     private PlayerTabList tabList;
     private List<Hook> hooks;
     private ScoreboardManager scoreboardManager;
-    private SortingManager sortingManager;
     @Getter
     private VanishManager vanishManager;
 
diff --git a/src/main/java/net/william278/velocitab/packet/ScoreboardManager.java b/src/main/java/net/william278/velocitab/packet/ScoreboardManager.java
index cc3ec88..c36642e 100644
--- a/src/main/java/net/william278/velocitab/packet/ScoreboardManager.java
+++ b/src/main/java/net/william278/velocitab/packet/ScoreboardManager.java
@@ -169,7 +169,7 @@ public class ScoreboardManager {
         siblings.forEach(server -> server.getPlayersConnected().forEach(connected -> {
             try {
 
-                boolean canSee = !plugin.getVanishManager().isVanished(p.getUsername())
+                boolean canSee = !plugin.getVanishManager().isVanished(connected.getUsername())
                         || plugin.getVanishManager().canSee(player.getUsername(), player.getUsername());
 
                 if (!canSee) {
diff --git a/src/main/java/net/william278/velocitab/tab/PlayerTabList.java b/src/main/java/net/william278/velocitab/tab/PlayerTabList.java
index c92cf43..dfad7a0 100644
--- a/src/main/java/net/william278/velocitab/tab/PlayerTabList.java
+++ b/src/main/java/net/william278/velocitab/tab/PlayerTabList.java
@@ -38,6 +38,7 @@ import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 import java.util.Optional;
+import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.TimeUnit;