diff options
author | md_5 <git@md-5.net> | 2016-06-09 11:43:49 +1000 |
---|---|---|
committer | md_5 <git@md-5.net> | 2016-06-09 11:43:49 +1000 |
commit | a8a4bedd2a9ef3c192ecf76db9afaf0b784ed08d (patch) | |
tree | 9efb0ce242b802a188032bd500ef7afaf29032a3 /nms-patches/EntityArrow.patch | |
parent | 0cd0397a8295992112ad3bf0d37795a04d22503e (diff) | |
download | craftbukkit-a8a4bedd2a9ef3c192ecf76db9afaf0b784ed08d.tar craftbukkit-a8a4bedd2a9ef3c192ecf76db9afaf0b784ed08d.tar.gz craftbukkit-a8a4bedd2a9ef3c192ecf76db9afaf0b784ed08d.tar.lz craftbukkit-a8a4bedd2a9ef3c192ecf76db9afaf0b784ed08d.tar.xz craftbukkit-a8a4bedd2a9ef3c192ecf76db9afaf0b784ed08d.zip |
Update to Minecraft 1.10
Diffstat (limited to 'nms-patches/EntityArrow.patch')
-rw-r--r-- | nms-patches/EntityArrow.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nms-patches/EntityArrow.patch b/nms-patches/EntityArrow.patch index 25005044..ef051dd0 100644 --- a/nms-patches/EntityArrow.patch +++ b/nms-patches/EntityArrow.patch @@ -21,7 +21,7 @@ if (entityliving instanceof EntityHuman) { this.fromPlayer = EntityArrow.PickupStatus.ALLOWED; } -@@ -229,7 +236,7 @@ +@@ -236,7 +243,7 @@ protected void a(MovingObjectPosition movingobjectposition) { Entity entity = movingobjectposition.entity; @@ -30,7 +30,7 @@ if (entity != null) { float f = MathHelper.sqrt(this.motX * this.motX + this.motY * this.motY + this.motZ * this.motZ); int i = MathHelper.f((double) f * this.damage); -@@ -247,7 +254,13 @@ +@@ -254,7 +261,13 @@ } if (this.isBurning() && !(entity instanceof EntityEnderman)) { @@ -45,7 +45,7 @@ } if (entity.damageEntity(damagesource, (float) i)) { -@@ -397,6 +410,20 @@ +@@ -410,6 +423,20 @@ public void d(EntityHuman entityhuman) { if (!this.world.isClientSide && this.inGround && this.shake <= 0) { @@ -66,7 +66,7 @@ boolean flag = this.fromPlayer == EntityArrow.PickupStatus.ALLOWED || this.fromPlayer == EntityArrow.PickupStatus.CREATIVE_ONLY && entityhuman.abilities.canInstantlyBuild; if (this.fromPlayer == EntityArrow.PickupStatus.ALLOWED && !entityhuman.inventory.pickup(this.j())) { -@@ -455,6 +482,12 @@ +@@ -468,6 +495,12 @@ return (b0 & 1) != 0; } |