diff options
| author | Wesley Wolfe <weswolf@aol.com> | 2012-12-29 19:05:32 -0600 |
|---|---|---|
| committer | feildmaster <admin@feildmaster.com> | 2012-12-29 19:18:37 -0600 |
| commit | 8954cb291caa65bfa26377082c8563be0cf0855e (patch) | |
| tree | 47d5ca548cd2db077cf882e7f5348e3c0e598a94 /src/main/java/net/minecraft/server | |
| parent | 7b5a8d0c23a23a16ce3e5317d16cb6a8f7f968c0 (diff) | |
| download | craftbukkit-8954cb291caa65bfa26377082c8563be0cf0855e.tar craftbukkit-8954cb291caa65bfa26377082c8563be0cf0855e.tar.gz craftbukkit-8954cb291caa65bfa26377082c8563be0cf0855e.tar.lz craftbukkit-8954cb291caa65bfa26377082c8563be0cf0855e.tar.xz craftbukkit-8954cb291caa65bfa26377082c8563be0cf0855e.zip | |
/dev/null does not accept EnchantmentThorns
Diffstat (limited to 'src/main/java/net/minecraft/server')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityArrow.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java index dfc1f567..d35ba418 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)); } |