summaryrefslogtreecommitdiffstats
path: root/nms-patches/EntitySkeleton.patch
diff options
context:
space:
mode:
Diffstat (limited to 'nms-patches/EntitySkeleton.patch')
-rw-r--r--nms-patches/EntitySkeleton.patch16
1 files changed, 4 insertions, 12 deletions
diff --git a/nms-patches/EntitySkeleton.patch b/nms-patches/EntitySkeleton.patch
index b606c11c..5dc70cdb 100644
--- a/nms-patches/EntitySkeleton.patch
+++ b/nms-patches/EntitySkeleton.patch
@@ -41,23 +41,15 @@
if (damagesource.i() instanceof EntityArrow && damagesource.getEntity() instanceof EntityHuman) {
EntityHuman entityhuman = (EntityHuman) damagesource.getEntity();
double d0 = entityhuman.locX - this.locX;
-@@ -136,9 +145,14 @@
- }
- } else if (damagesource.getEntity() instanceof EntityCreeper && ((EntityCreeper) damagesource.getEntity()).isPowered() && ((EntityCreeper) damagesource.getEntity()).canCauseHeadDrop()) {
+@@ -138,6 +147,7 @@
((EntityCreeper) damagesource.getEntity()).setCausedHeadDrop();
-- this.a(new ItemStack(Items.SKULL, 1, this.getSkeletonType() == 1 ? 1 : 0), 0.0F);
-+ // CraftBukkit start
-+ // this.a(new ItemStack(Items.SKULL, 1, this.getSkeletonType() == 1 ? 1 : 0), 0.0F);
-+ headDrop = new ItemStack(Items.SKULL, 1, this.getSkeletonType() == 1 ? 1 : 0);
-+ // CraftBukkit end
+ this.a(new ItemStack(Items.SKULL, 1, this.getSkeletonType() == 1 ? 1 : 0), 0.0F);
}
-
+ super.die(damagesource); // CraftBukkit - moved from above
-+
+
}
- protected MinecraftKey J() {
-@@ -212,11 +226,30 @@
+@@ -212,11 +222,30 @@
}
if (EnchantmentManager.a(Enchantments.ARROW_FIRE, (EntityLiving) this) > 0 || this.getSkeletonType() == 1) {