45 lines
2.8 KiB
Diff
45 lines
2.8 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Aikar <aikar@aikar.co>
|
||
|
|
Date: Sat, 15 Jun 2013 19:51:17 -0400
|
||
|
|
Subject: [PATCH] Improve EntityShootBowEvent
|
||
|
|
|
||
|
|
Adds missing call to Illagers and also adds Arrow ItemStack to skeltons
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
|
||
|
|
index 2e03ddee685437061f123ede7c194b03d18076ee..73ac27913102f810a30bc704479b382f08a91132 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
|
||
|
|
@@ -134,8 +134,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(), entityarrow.getOriginalItemStack(), entityarrow, entityliving.getRaisedHand(), 0.8F, true);
|
||
|
|
+ if (event.isCancelled()) {
|
||
|
|
+ event.getProjectile().remove();
|
||
|
|
+ return;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ if (event.getProjectile() == entityarrow.getBukkitEntity()) {
|
||
|
|
+ this.world.addEntity(entityarrow);
|
||
|
|
+ }
|
||
|
|
this.playSound(SoundEffects.ENTITY_SKELETON_SHOOT, 1.0F, 1.0F / (this.getRandom().nextFloat() * 0.4F + 0.8F));
|
||
|
|
- this.world.addEntity(entityarrow);
|
||
|
|
+ // Paper end
|
||
|
|
}
|
||
|
|
|
||
|
|
class a extends EntityIllagerWizard.c {
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
|
||
|
|
index ac013d55c5df502d8a8cdf18237a0ca956a444c4..513bb3087ea8e81d36dcc8f78e22b6c63b26f582 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
|
||
|
|
@@ -155,7 +155,7 @@ public abstract class EntitySkeletonAbstract extends EntityMonster implements IR
|
||
|
|
|
||
|
|
entityarrow.shoot(d0, d1 + d3 * 0.20000000298023224D, d2, 1.6F, (float) (14 - this.world.getDifficulty().a() * 4));
|
||
|
|
// CraftBukkit start
|
||
|
|
- org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(this, this.getItemInMainHand(), null, entityarrow, EnumHand.MAIN_HAND, 0.8F, true);
|
||
|
|
+ org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(this, this.getItemInMainHand(), entityarrow.getOriginalItemStack(), entityarrow, EnumHand.MAIN_HAND, 0.8F, true); // Paper
|
||
|
|
if (event.isCancelled()) {
|
||
|
|
event.getProjectile().remove();
|
||
|
|
return;
|