fixed vanish

czQery · Aug 17, 2024 · db6af53 · db6af53
1 parent a36239b
commit db6af53
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 21 deletions.
diff --git a/src/main/java/cz/qery/toolkit/Vnsh.java b/src/main/java/cz/qery/toolkit/Vnsh.java
@@ -76,7 +76,7 @@ public static void Hide(Player p, boolean init) {
         p.setSleepingIgnored(true);
         p.setAllowFlight(true);
         for (Entity e : p.getWorld().getEntities()) {
-            if (e instanceof Creature && ((Creature) e).getTarget() != null && ((Creature) e).getTarget().getUniqueId() == p.getUniqueId()) {
+            if (e instanceof Creature && ((Creature) e).getTarget() != null && ((Creature) e).getTarget().getUniqueId().compareTo(p.getUniqueId()) == 0) {
                 ((Creature) e).setTarget(null);
             }
         }

diff --git a/src/main/java/cz/qery/toolkit/commands/Cmdblock.java b/src/main/java/cz/qery/toolkit/commands/Cmdblock.java
@@ -102,9 +102,7 @@ public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Comman
                 list.add("remove");
                 list.add("list");
             }
-            case 2 -> {
-                list.add("name");
-            }
+            case 2 -> list.add("name");
         }
 
         if (!list.isEmpty()) {

diff --git a/src/main/java/cz/qery/toolkit/commands/Lunar.java b/src/main/java/cz/qery/toolkit/commands/Lunar.java
@@ -173,9 +173,7 @@ public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Comman
                 list.add("remove");
                 list.add("list");
             }
-            case 3 -> {
-                list.add("name");
-            }
+            case 3 -> list.add("name");
             case 4 -> {
                 list.add("#ffffff");
                 list.add("#ff0000");

diff --git a/src/main/java/cz/qery/toolkit/events/Join.java b/src/main/java/cz/qery/toolkit/events/Join.java
@@ -41,7 +41,7 @@ public void onJoin(PlayerJoinEvent e) {
 
         // vanish
         for (Map.Entry<UUID, String> pl : Vnsh.players.entrySet()) {
-            if (p.getUniqueId() == pl.getKey()) {
+            if (p.getUniqueId().compareTo(pl.getKey()) == 0) {
                 Vnsh.Hide(p, false);
             } else {
                 Player target = Bukkit.getServer().getPlayer(pl.getKey());

diff --git a/src/main/java/cz/qery/toolkit/events/Silent.java b/src/main/java/cz/qery/toolkit/events/Silent.java
@@ -11,9 +11,7 @@
 import org.bukkit.event.entity.*;
 import org.bukkit.event.player.PlayerAdvancementDoneEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.event.server.ServerListPingEvent;
 
-import java.util.Iterator;
 import java.util.Objects;
 
 public class Silent implements Listener {
@@ -76,15 +74,4 @@ public void onItemPickup(EntityPickupItemEvent e) {
             e.setCancelled(true);
         }
     }
-
-    @EventHandler
-    public void onServerListPing(ServerListPingEvent e) {
-        Iterator<Player> iterator = e.iterator();
-        while (iterator.hasNext()) {
-            Player p = iterator.next();
-            if (Vnsh.players.get(p.getUniqueId()) != null) {
-                iterator.remove();
-            }
-        }
-    }
 }