diff options
Diffstat (limited to 'patches/server/0113-Add-ProjectileCollideEvent.patch')
-rw-r--r-- | patches/server/0113-Add-ProjectileCollideEvent.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/patches/server/0113-Add-ProjectileCollideEvent.patch b/patches/server/0113-Add-ProjectileCollideEvent.patch new file mode 100644 index 0000000000..df432de74e --- /dev/null +++ b/patches/server/0113-Add-ProjectileCollideEvent.patch @@ -0,0 +1,45 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Techcable <[email protected]> +Date: Fri, 16 Dec 2016 21:25:39 -0600 +Subject: [PATCH] Add ProjectileCollideEvent + +Deprecated now and replaced with ProjectileHitEvent + +diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +index a3a63c5988eaa987a3718dfa79876e81d05e7fa6..0aa10b1709c195d766eb49e21d9bc19d7cecf760 100644 +--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java ++++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +@@ -1299,6 +1299,17 @@ public class CraftEventFactory { + return CraftItemStack.asNMSCopy(bitem); + } + ++ // Paper start ++ @Deprecated ++ public static com.destroystokyo.paper.event.entity.ProjectileCollideEvent callProjectileCollideEvent(Entity entity, EntityHitResult position) { ++ Projectile projectile = (Projectile) entity.getBukkitEntity(); ++ org.bukkit.entity.Entity collided = position.getEntity().getBukkitEntity(); ++ com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = new com.destroystokyo.paper.event.entity.ProjectileCollideEvent(projectile, collided); ++ Bukkit.getPluginManager().callEvent(event); ++ return event; ++ } ++ // Paper end ++ + public static ProjectileLaunchEvent callProjectileLaunchEvent(Entity entity) { + Projectile bukkitEntity = (Projectile) entity.getBukkitEntity(); + ProjectileLaunchEvent event = new ProjectileLaunchEvent(bukkitEntity); +@@ -1323,8 +1334,15 @@ public class CraftEventFactory { + if (position.getType() == HitResult.Type.ENTITY) { + hitEntity = ((EntityHitResult) position).getEntity().getBukkitEntity(); + } ++ // Paper start - legacy event ++ boolean cancelled = false; ++ if (hitEntity != null && position instanceof EntityHitResult entityHitResult) { ++ cancelled = callProjectileCollideEvent(entity, entityHitResult).isCancelled(); ++ } ++ // Paper end + + ProjectileHitEvent event = new ProjectileHitEvent((Projectile) entity.getBukkitEntity(), hitEntity, hitBlock, hitFace); ++ event.setCancelled(cancelled); // Paper - propagate legacy event cancellation to modern event + entity.level().getCraftServer().getPluginManager().callEvent(event); + return event; + } |