diff options
| author | md_5 <git@md-5.net> | 2016-11-28 12:47:01 +1100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2016-11-28 12:47:01 +1100 |
| commit | 1c07d5c78f07bf8a5dcc73c6f16f1b9743565b06 (patch) | |
| tree | ceacd2fad8185491f95a4a4c318fdb6be87433cb /nms-patches | |
| parent | 2ba48b4965389ded9f4883bcb1da021710f0feb7 (diff) | |
| download | craftbukkit-1c07d5c78f07bf8a5dcc73c6f16f1b9743565b06.tar craftbukkit-1c07d5c78f07bf8a5dcc73c6f16f1b9743565b06.tar.gz craftbukkit-1c07d5c78f07bf8a5dcc73c6f16f1b9743565b06.tar.lz craftbukkit-1c07d5c78f07bf8a5dcc73c6f16f1b9743565b06.tar.xz craftbukkit-1c07d5c78f07bf8a5dcc73c6f16f1b9743565b06.zip | |
Add hitEntity to ProjectileHitEvent
Diffstat (limited to 'nms-patches')
| -rw-r--r-- | nms-patches/EntityArrow.patch | 2 | ||||
| -rw-r--r-- | nms-patches/EntityFireball.patch | 2 | ||||
| -rw-r--r-- | nms-patches/EntityFishingHook.patch | 2 | ||||
| -rw-r--r-- | nms-patches/EntityProjectile.patch | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/nms-patches/EntityArrow.patch b/nms-patches/EntityArrow.patch index f8c15319..656ebe0a 100644 --- a/nms-patches/EntityArrow.patch +++ b/nms-patches/EntityArrow.patch @@ -27,7 +27,7 @@ protected void a(MovingObjectPosition movingobjectposition) { Entity entity = movingobjectposition.entity; - -+ org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileHitEvent(this); // CraftBukkit - Call event ++ org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileHitEvent(this, movingobjectposition); // CraftBukkit - Call event if (entity != null) { float f = MathHelper.sqrt(this.motX * this.motX + this.motY * this.motY + this.motZ * this.motZ); int i = MathHelper.f((double) f * this.damage); diff --git a/nms-patches/EntityFireball.patch b/nms-patches/EntityFireball.patch index 02e43ed8..28389160 100644 --- a/nms-patches/EntityFireball.patch +++ b/nms-patches/EntityFireball.patch @@ -44,7 +44,7 @@ + + // CraftBukkit start - Fire ProjectileHitEvent + if (this.dead) { -+ CraftEventFactory.callProjectileHitEvent(this); ++ CraftEventFactory.callProjectileHitEvent(this, movingobjectposition); + } + // CraftBukkit end } diff --git a/nms-patches/EntityFishingHook.patch b/nms-patches/EntityFishingHook.patch index 8aea9439..7b0fbc62 100644 --- a/nms-patches/EntityFishingHook.patch +++ b/nms-patches/EntityFishingHook.patch @@ -16,7 +16,7 @@ } if (movingobjectposition != null && movingobjectposition.type != MovingObjectPosition.EnumMovingObjectType.MISS) { -+ org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileHitEvent(this); // Craftbukkit - Call event ++ org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileHitEvent(this, movingobjectposition); // Craftbukkit - Call event if (movingobjectposition.type == MovingObjectPosition.EnumMovingObjectType.ENTITY) { this.hooked = movingobjectposition.entity; this.s(); diff --git a/nms-patches/EntityProjectile.patch b/nms-patches/EntityProjectile.patch index 5e01a87c..17b70ac1 100644 --- a/nms-patches/EntityProjectile.patch +++ b/nms-patches/EntityProjectile.patch @@ -14,7 +14,7 @@ this.a(movingobjectposition); + // CraftBukkit start + if (this.dead) { -+ org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileHitEvent(this); ++ org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileHitEvent(this, movingobjectposition); + } + // CraftBukkit end } |