diff options
Diffstat (limited to 'Spigot-Server-Patches/0180-Add-ProjectileCollideEvent.patch')
| -rw-r--r-- | Spigot-Server-Patches/0180-Add-ProjectileCollideEvent.patch | 111 |
1 files changed, 111 insertions, 0 deletions
diff --git a/Spigot-Server-Patches/0180-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0180-Add-ProjectileCollideEvent.patch new file mode 100644 index 0000000000..6f793245ea --- /dev/null +++ b/Spigot-Server-Patches/0180-Add-ProjectileCollideEvent.patch @@ -0,0 +1,111 @@ +From 4dd0ba8a60d9a18c1edc5042efbe5ead2465712c Mon Sep 17 00:00:00 2001 +From: Techcable <[email protected]> +Date: Fri, 16 Dec 2016 21:25:39 -0600 +Subject: [PATCH] Add ProjectileCollideEvent + + +diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java +index 8cda47518..79ca071bc 100644 +--- a/src/main/java/net/minecraft/server/EntityArrow.java ++++ b/src/main/java/net/minecraft/server/EntityArrow.java +@@ -190,6 +190,15 @@ public abstract class EntityArrow extends Entity implements IProjectile { + } + } + ++ // Paper start - Call ProjectileCollideEvent ++ if (movingobjectposition != null && movingobjectposition.entity != null) { ++ com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileCollideEvent(this, movingobjectposition); ++ if (event.isCancelled()) { ++ movingobjectposition = null; ++ } ++ } ++ // Paper end ++ + if (movingobjectposition != null) { + this.a(movingobjectposition); + } +diff --git a/src/main/java/net/minecraft/server/EntityFireball.java b/src/main/java/net/minecraft/server/EntityFireball.java +index 789de85d1..d5c9d24cf 100644 +--- a/src/main/java/net/minecraft/server/EntityFireball.java ++++ b/src/main/java/net/minecraft/server/EntityFireball.java +@@ -70,6 +70,15 @@ public abstract class EntityFireball extends Entity { + ++this.f; + MovingObjectPosition movingobjectposition = ProjectileHelper.a(this, true, this.f >= 25, this.shooter); + ++ // Paper start - Call ProjectileCollideEvent ++ if (movingobjectposition != null && movingobjectposition.entity != null) { ++ com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = CraftEventFactory.callProjectileCollideEvent(this, movingobjectposition); ++ if (event.isCancelled()) { ++ movingobjectposition = null; ++ } ++ } ++ // Paper end ++ + if (movingobjectposition != null) { + this.a(movingobjectposition); + +diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java +index 606160a17..b78e0e49e 100644 +--- a/src/main/java/net/minecraft/server/EntityFishingHook.java ++++ b/src/main/java/net/minecraft/server/EntityFishingHook.java +@@ -240,6 +240,16 @@ public class EntityFishingHook extends Entity { + + vec3d = new Vec3D(this.locX, this.locY, this.locZ); + vec3d1 = new Vec3D(this.locX + this.motX, this.locY + this.motY, this.locZ + this.motZ); ++ ++ // Paper start - Call ProjectileCollideEvent ++ if (movingobjectposition != null && movingobjectposition.entity != null) { ++ com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileCollideEvent(this, movingobjectposition); ++ if (event.isCancelled()) { ++ movingobjectposition = null; ++ } ++ } ++ // Paper end ++ + if (movingobjectposition != null) { + vec3d1 = new Vec3D(movingobjectposition.pos.x, movingobjectposition.pos.y, movingobjectposition.pos.z); + } +diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java +index 6fbc84559..a8b9d9263 100644 +--- a/src/main/java/net/minecraft/server/EntityProjectile.java ++++ b/src/main/java/net/minecraft/server/EntityProjectile.java +@@ -160,6 +160,15 @@ public abstract class EntityProjectile extends Entity implements IProjectile { + movingobjectposition = new MovingObjectPosition(entity); + } + ++ // Paper start - Call ProjectileCollideEvent ++ if (movingobjectposition != null && movingobjectposition.entity != null) { ++ com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileCollideEvent(this, movingobjectposition); ++ if (event.isCancelled()) { ++ movingobjectposition = null; ++ } ++ } ++ // Paper end ++ + if (movingobjectposition != null) { + if (movingobjectposition.type == MovingObjectPosition.EnumMovingObjectType.BLOCK && this.world.getType(movingobjectposition.a()).getBlock() == Blocks.PORTAL) { + this.e(movingobjectposition.a()); +diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +index 7e4982d93..a850a9634 100644 +--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java ++++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +@@ -794,6 +794,16 @@ public class CraftEventFactory { + return CraftItemStack.asNMSCopy(bitem); + } + ++ // Paper start ++ public static com.destroystokyo.paper.event.entity.ProjectileCollideEvent callProjectileCollideEvent(Entity entity, MovingObjectPosition position) { ++ Projectile projectile = (Projectile) entity.getBukkitEntity(); ++ org.bukkit.entity.Entity collided = position.entity.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); +-- +2.12.0.windows.1 + |