diff options
Diffstat (limited to 'Spigot-Server-Patches/0179-Add-ProjectileCollideEvent.patch')
| -rw-r--r-- | Spigot-Server-Patches/0179-Add-ProjectileCollideEvent.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Spigot-Server-Patches/0179-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0179-Add-ProjectileCollideEvent.patch index e014497d9f..3ee5b37eb3 100644 --- a/Spigot-Server-Patches/0179-Add-ProjectileCollideEvent.patch +++ b/Spigot-Server-Patches/0179-Add-ProjectileCollideEvent.patch @@ -1,11 +1,11 @@ -From bd732661c1ea17893a42fb8c6d6a301d3d411b87 Mon Sep 17 00:00:00 2001 +From c155f03d606fa1536e7a337990e7be51783ef5f3 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 +index 8cda4751..79ca071b 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 { @@ -25,7 +25,7 @@ index 8cda47518..79ca071bc 100644 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 +index 789de85d..d5c9d24c 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 { @@ -45,7 +45,7 @@ index 789de85d1..d5c9d24cf 100644 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 +index 606160a1..b78e0e49 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 { @@ -66,7 +66,7 @@ index 606160a17..b78e0e49e 100644 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 +index 6fbc8455..a8b9d926 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 { @@ -86,10 +86,10 @@ index 6fbc84559..a8b9d9263 100644 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 104c3ce1d..a7f827b67 100644 +index 7e4982d9..a850a963 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -792,6 +792,16 @@ public class CraftEventFactory { +@@ -794,6 +794,16 @@ public class CraftEventFactory { return CraftItemStack.asNMSCopy(bitem); } @@ -107,5 +107,5 @@ index 104c3ce1d..a7f827b67 100644 Projectile bukkitEntity = (Projectile) entity.getBukkitEntity(); ProjectileLaunchEvent event = new ProjectileLaunchEvent(bukkitEntity); -- -2.11.0 +2.12.0.windows.1 |