もしツールを発射出来た時イベントを取り消すようにした (Close #5)

mc-nekoneko · Jun 16, 2020 · d12e5b3 · d12e5b3
1 parent 3d163b0
commit d12e5b3
Showing 1 changed file with 21 additions and 0 deletions.
diff --git a/src/main/java/com/rathserver/event/invisible/InvisibleListener.java b/src/main/java/com/rathserver/event/invisible/InvisibleListener.java
@@ -28,11 +28,13 @@
 import org.bukkit.Sound;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
+import org.bukkit.entity.Projectile;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.entity.PlayerDeathEvent;
+import org.bukkit.event.entity.ProjectileLaunchEvent;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.player.PlayerDropItemEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
@@ -97,6 +99,25 @@ public void pvp(EntityDamageByEntityEvent event) {
         if (inventory.contains(this.plugin.getInvisibleActiveItem())) event.setCancelled(true);
     }
 
+    @EventHandler
+    public void projectileLaunch(ProjectileLaunchEvent event) {
+        Projectile entity = event.getEntity();
+        if (entity.getType() != EntityType.ENDER_PEARL && entity.getType() != EntityType.ENDER_SIGNAL) {
+            return;
+        }
+        if (entity.getShooter() instanceof Player) {
+            Player shooter = (Player) entity.getShooter();
+            ItemStack itemStack = shooter.getInventory().getItemInMainHand();
+            if (!itemStack.equals(this.plugin.getInvisibleActiveItem()) && !itemStack.equals(this.plugin.getInvisibleDeActiveItem())) {
+                itemStack = shooter.getInventory().getItemInOffHand();
+                if (!itemStack.equals(this.plugin.getInvisibleActiveItem()) && !itemStack.equals(this.plugin.getInvisibleDeActiveItem())) {
+                    return;
+                }
+            }
+            event.setCancelled(true);
+        }
+    }
+
     @EventHandler
     public void playerInteract(PlayerInteractEvent event) {
         if (event.getAction() != Action.RIGHT_CLICK_BLOCK && event.getAction() != Action.RIGHT_CLICK_AIR) {