From 8954cb291caa65bfa26377082c8563be0cf0855e Mon Sep 17 00:00:00 2001 From: Wesley Wolfe Date: Sat, 29 Dec 2012 19:05:32 -0600 Subject: [PATCH] /dev/null does not accept EnchantmentThorns --- src/main/java/net/minecraft/server/EntityArrow.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java index dfc1f56784..d35ba4185f 100644 --- a/src/main/java/net/minecraft/server/EntityArrow.java +++ b/src/main/java/net/minecraft/server/EntityArrow.java @@ -250,7 +250,11 @@ public class EntityArrow extends Entity implements IProjectile { } } - EnchantmentThorns.a(this.shooter, entityliving, this.random); + // CraftBukkit start + if (this.shooter != null) { + EnchantmentThorns.a(this.shooter, entityliving, this.random); + } + // CraftBukkit end if (this.shooter != null && movingobjectposition.entity != this.shooter && movingobjectposition.entity instanceof EntityHuman && this.shooter instanceof EntityPlayer) { ((EntityPlayer) this.shooter).playerConnection.sendPacket(new Packet70Bed(6, 0)); }