Simplify vanish check and bump major version

Author: RhythmicSys

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>simplexity</groupId>
     <artifactId>SimpleVanish</artifactId>
-    <version>1.1.2</version>
+    <version>2.0.0</version>
     <packaging>jar</packaging>
 
     <name>SimpleVanish</name>

src/main/java/simplexity/simplevanish/listeners/TrialSpawnListener.java

@@ -1,35 +1,24 @@
 package simplexity.simplevanish.listeners;
 
-import org.bukkit.block.BlockState;
 import org.bukkit.block.TrialSpawner;
-import org.bukkit.block.data.BlockData;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.TrialSpawnerSpawnEvent;
-import org.slf4j.Logger;
-import simplexity.simplevanish.SimpleVanish;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Optional;
 
 @SuppressWarnings("UnstableApiUsage")
 public class TrialSpawnListener implements Listener {
 
     @EventHandler
     public void onTrialSpawn(TrialSpawnerSpawnEvent spawnEvent) {
         TrialSpawner spawner = spawnEvent.getTrialSpawner();
-        List<Player> trackedPlayers = new ArrayList<>(spawner.getTrackedPlayers().stream().toList());
-        List<Player> modifiedPlayers = new ArrayList<>();
-        for (Player player : trackedPlayers) {
-            if (ListenerUtils.userNotVanished(player)) {
-                modifiedPlayers.add(player);
-            }
-        }
-        if (!modifiedPlayers.isEmpty()) return;
+        Optional<Player> anyModifiedPlayer = spawner.getTrackedPlayers().stream()
+                .filter(ListenerUtils::userNotVanished)
+                .findAny();
+        if (anyModifiedPlayer.isEmpty()) return;
         spawner.setNextSpawnAttempt(0L);
         spawnEvent.setCancelled(true);
     }
-
-
 }

src/main/resources/plugin.yml

@@ -1,7 +1,7 @@
 name: SimpleVanish
 version: '${project.version}'
 main: simplexity.simplevanish.SimpleVanish
-api-version: '1.21'
+api-version: '1.21.6'
 softdepend:
   - PlaceholderAPI
 permissions:
@@ -114,4 +114,4 @@ commands:
   vsettings:
     permission: vanish.command
     description: Command for adjusting personal settings for vanish
-    aliases: [vsettings, vset, v-settings]
+    aliases: [vsettings, vset, v-settings]