Merge pull request #7 from Simplexity-Development/spawner-trigger

Temporary solution for trial chamber and spawners spawning when vanished members are around

Author: RhythmicSys

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>simplexity</groupId>
     <artifactId>SimpleVanish</artifactId>
-    <version>1.1.1</version>
+    <version>2.0.0</version>
     <packaging>jar</packaging>
 
     <name>SimpleVanish</name>
@@ -80,7 +80,7 @@
         <dependency>
             <groupId>io.papermc.paper</groupId>
             <artifactId>paper-api</artifactId>
-            <version>1.21.1-R0.1-SNAPSHOT</version>
+            <version>1.21.6-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

src/main/java/simplexity/simplevanish/SimpleVanish.java

@@ -1,6 +1,5 @@
 package simplexity.simplevanish;
 
-import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.bukkit.plugin.java.JavaPlugin;
 import simplexity.simplevanish.commands.FakeCommand;
@@ -30,6 +29,8 @@
 import simplexity.simplevanish.listeners.PlayerLeaveListener;
 import simplexity.simplevanish.listeners.PreCommandListener;
 import simplexity.simplevanish.listeners.TargetListener;
+import simplexity.simplevanish.listeners.TrialSpawnListener;
+import simplexity.simplevanish.listeners.VaultStateListener;
 import simplexity.simplevanish.objects.VanishPermission;
 import simplexity.simplevanish.saving.Cache;
 import simplexity.simplevanish.saving.SqlHandler;
@@ -55,8 +56,6 @@ public void onEnable() {
         registerSubCommands();
         registerListeners();
         checkForPapi();
-        // Plugin startup logic
-
     }
 
     private void registerCommands() {
@@ -103,6 +102,8 @@ private void registerListeners() {
         this.getServer().getPluginManager().registerEvents(new PlayerLeaveListener(), this);
         this.getServer().getPluginManager().registerEvents(new TargetListener(), this);
         this.getServer().getPluginManager().registerEvents(new PreCommandListener(), this);
+        this.getServer().getPluginManager().registerEvents(new TrialSpawnListener(), this);
+        this.getServer().getPluginManager().registerEvents(new VaultStateListener(), this);
     }
 
     private void checkForPapi() {

src/main/java/simplexity/simplevanish/handling/UnvanishHandler.java

@@ -39,6 +39,7 @@ public void runUnvanishEvent(Player player, boolean fakeJoin, String notificatio
         }
         MessageHandler.getInstance().removeChangedTablist(player);
         removeGlow(player);
+        player.setAffectsSpawning(true);
         Cache.getVanishedPlayers().remove(player);
         settings.setVanished(false);
         SqlHandler.getInstance().savePlayerSettings(player.getUniqueId(), settings);

src/main/java/simplexity/simplevanish/handling/VanishHandler.java

@@ -37,6 +37,7 @@ public void runVanishEvent(Player player, boolean fakeLeave, String notification
         MessageHandler.getInstance().changeTablist(player);
         MessageHandler.getInstance().sendAdminNotification(player, notificationMessage);
         giveGlow(player);
+        player.setAffectsSpawning(false);
         Cache.getVanishedPlayers().add(player);
         settings.setVanished(true);
         SqlHandler.getInstance().savePlayerSettings(player.getUniqueId(), settings);

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

@@ -12,7 +12,7 @@ public class AttackListener implements Listener {
     @EventHandler
     public void onAttack(PrePlayerAttackEntityEvent attackEvent) {
         Player player = attackEvent.getPlayer();
-        if (ListenerUtils.shouldEarlyReturn(player)) return;
+        if (ListenerUtils.userNotVanished(player)) return;
         if (attackEnabled(player)) return;
         attackEvent.setCancelled(true);
     }

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

@@ -12,7 +12,7 @@ public class BlockBreakListener implements Listener {
     @EventHandler
     public void onBlockBreak(BlockBreakEvent breakEvent) {
         Player player = breakEvent.getPlayer();
-        if (ListenerUtils.shouldEarlyReturn(player)) return;
+        if (ListenerUtils.userNotVanished(player)) return;
         if (blockBreakEnabled(player)) return;
         breakEvent.setCancelled(true);
     }

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

@@ -20,7 +20,7 @@ public void onContainerOpen(PlayerInteractEvent interactEvent) {
         if (interactEvent.getHand() == null) return;
         if (interactEvent.getHand().equals(EquipmentSlot.OFF_HAND)) return;
         Player player = interactEvent.getPlayer();
-        if (ListenerUtils.shouldEarlyReturn(player)) return;
+        if (ListenerUtils.userNotVanished(player)) return;
         Block block = interactEvent.getClickedBlock();
         if (block == null) return;
         if (!ConfigHandler.getInstance().getContainersToBlock().contains(block.getType())) return;

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

@@ -11,7 +11,7 @@
 public class ItemPickupListener implements Listener {
     @EventHandler
     public void onItemPickup(EntityPickupItemEvent pickupEvent) {
-        if (ListenerUtils.shouldEarlyReturn(pickupEvent.getEntity())) return;
+        if (ListenerUtils.userNotVanished(pickupEvent.getEntity())) return;
         if (pickupEnabled((Player) pickupEvent.getEntity())) return;
         pickupEvent.setCancelled(true);
     }

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

@@ -6,12 +6,12 @@
 
 public class ListenerUtils {
 
-    public static boolean shouldEarlyReturn(Entity entity) {
+    public static boolean userNotVanished(Entity entity) {
         if (!(entity instanceof Player player)) return true;
-        return shouldEarlyReturn(player);
+        return userNotVanished(player);
     }
 
-    public static boolean shouldEarlyReturn(Player player) {
+    public static boolean userNotVanished(Player player) {
         return (!Cache.getVanishedPlayers().contains(player));
     }
 }

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

@@ -11,7 +11,7 @@
 public class TargetListener implements Listener {
     @EventHandler
     public void onTarget(EntityTargetEvent targetEvent) {
-        if (ListenerUtils.shouldEarlyReturn(targetEvent.getTarget())) return;
+        if (ListenerUtils.userNotVanished(targetEvent.getTarget())) return;
         if (targetingEnabled((Player) targetEvent.getTarget())) return;
         targetEvent.setCancelled(true);
     }