Fix sulk sensors detecting vanished players (#5262)

EssentialsX · Apr 2, 2023 · e7c56b3 · e7c56b3
1 parent 11e6d3c
commit e7c56b3
Showing 1 changed file with 22 additions and 0 deletions.
diff --git a/Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java
@@ -121,13 +121,26 @@ private static boolean isArrowPickupEvent() {
         }
     }
 
+    private static boolean isGameEventEvent() {
+        try {
+            Class.forName("org.bukkit.event.block.BlockReceiveGameEvent");
+            return true;
+        } catch (final ClassNotFoundException ignored) {
+            return false;
+        }
+    }
+
     public void registerEvents() {
         ess.getServer().getPluginManager().registerEvents(this, ess);
 
         if (isArrowPickupEvent()) {
             ess.getServer().getPluginManager().registerEvents(new ArrowPickupListener(), ess);
         }
 
+        if (isGameEventEvent()) {
+            ess.getServer().getPluginManager().registerEvents(new SculkListener1_17(), ess);
+        }
+
         if (isEntityPickupEvent()) {
             ess.getServer().getPluginManager().registerEvents(new PickupListener1_12(), ess);
         } else {
@@ -1001,6 +1014,15 @@ public void onPlayerPickupItem(final org.bukkit.event.entity.EntityPickupItemEve
         }
     }
 
+    private final class SculkListener1_17 implements Listener {
+        @EventHandler
+        public void onGameEvent(final org.bukkit.event.block.BlockReceiveGameEvent event) {
+            if (event.getEntity() instanceof Player && ess.getUser((Player) event.getEntity()).isVanished()) {
+                event.setCancelled(true);
+            }
+        }
+    }
+
     private final class CommandSendFilter implements CommandSendListenerProvider.Filter {
         @Override
         public Predicate<String> apply(Player player) {