fix(api): Fixed NPE in AuthMeVelocityAPI#removePlayerIf

4drian3d · Apr 22, 2023 · e4716b4 · e4716b4
1 parent d617995
commit e4716b4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...city/src/main/java/io/github/_4drian3d/authmevelocity/api/velocity/AuthMeVelocityAPI.java b/...city/src/main/java/io/github/_4drian3d/authmevelocity/api/velocity/AuthMeVelocityAPI.java
@@ -61,7 +61,7 @@ public interface AuthMeVelocityAPI {
      * Removes players who meet the established condition
      * @param predicate the condition
      */
-    void removePlayerIf(@NotNull Predicate<Player> predicate);
+    void removePlayerIf(@NotNull Predicate<@NotNull Player> predicate);
 
     /**
      * Check if the player is on a login server

diff --git a/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/AuthMeVelocityPlugin.java b/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/AuthMeVelocityPlugin.java
@@ -186,7 +186,7 @@ public boolean removePlayer(@NotNull Player player){
 
     @Override
     public void removePlayerIf(@NotNull Predicate<Player> predicate){
-        loggedPlayers.removeIf(uuid -> predicate.test(proxy.getPlayer(uuid).orElse(null)));
+        loggedPlayers.removeIf(uuid -> proxy.getPlayer(uuid).filter(predicate).isPresent());
     }
 
     @Override