From d5817e9910d06a5d628ed1567729bf3ef0ac1053 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 18 Jun 2018 22:19:59 -0400 Subject: [PATCH] Fire EntityShootBowEvent for Illusioner --- ...e-EntityShootBowEvent-for-Illusioner.patch | 33 +++++++++++++++++++ scripts/importmcdev.sh | 1 + 2 files changed, 34 insertions(+) create mode 100644 Spigot-Server-Patches/0313-Fire-EntityShootBowEvent-for-Illusioner.patch diff --git a/Spigot-Server-Patches/0313-Fire-EntityShootBowEvent-for-Illusioner.patch b/Spigot-Server-Patches/0313-Fire-EntityShootBowEvent-for-Illusioner.patch new file mode 100644 index 0000000000..6ecf8d82aa --- /dev/null +++ b/Spigot-Server-Patches/0313-Fire-EntityShootBowEvent-for-Illusioner.patch @@ -0,0 +1,33 @@ +From 8e5354672ebc3a56460bf7d8ddcd361ab93205d6 Mon Sep 17 00:00:00 2001 +From: Aikar +Date: Mon, 18 Jun 2018 22:19:36 -0400 +Subject: [PATCH] Fire EntityShootBowEvent for Illusioner + + +diff --git a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java +index e03650448..ad81bd059 100644 +--- a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java ++++ b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java +@@ -123,8 +123,18 @@ public class EntityIllagerIllusioner extends EntityIllagerWizard implements IRan + double d3 = (double) MathHelper.sqrt(d0 * d0 + d2 * d2); + + entityarrow.shoot(d0, d1 + d3 * 0.20000000298023224D, d2, 1.6F, (float) (14 - this.world.getDifficulty().a() * 4)); ++ // Paper start ++ org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(this, this.getItemInMainHand(), this.getItemInOffHand(), entityarrow,0.8F); ++ if (event.isCancelled()) { ++ event.getProjectile().remove(); ++ return; ++ } ++ ++ if (event.getProjectile() == entityarrow.getBukkitEntity()) { ++ this.world.addEntity(entityarrow); ++ } + this.a(SoundEffects.gW, 1.0F, 1.0F / (this.getRandom().nextFloat() * 0.4F + 0.8F)); +- this.world.addEntity(entityarrow); ++ // Paper end + } + + protected EntityArrow r(float f) { +-- +2.17.1 + diff --git a/scripts/importmcdev.sh b/scripts/importmcdev.sh index 089e2cdedb..8b90e0aeed 100755 --- a/scripts/importmcdev.sh +++ b/scripts/importmcdev.sh @@ -67,6 +67,7 @@ import DefinedStructure import DragonControllerLandedFlame import EnchantmentManager import Enchantments +import EntityIllagerIllusioner import EntityLlama import EntitySquid import EntityTypes