Update upstream CB/Spigot

cc GH-146

CraftBukkit

@@ -1 +1 @@
-Subproject commit 95548945533d8572a7cb911b33c8ef4a823be49b
+Subproject commit 6bf25cde7ecbaeb89bdfe18e7971669cec668646

Spigot

@@ -1 +1 @@
-Subproject commit 5d4e372f482b9291a1255c62a6b02c754b66d5f8
+Subproject commit 129f87a2c0ca73bea240b952d62e98ec59a1dc66

Spigot-Server-Patches/0004-Timings-v2.patch

@@ -1,4 +1,4 @@
-From be7d3cc0654179afcab12bc8e1d79b5b79f78e47 Mon Sep 17 00:00:00 2001
+From 15b0477798ca18b841f8ce8f5b5d66003a159b9f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
@@ -328,7 +328,7 @@ index 3665f8a..146223a 100644
  
      public void recalcPosition() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 1bd2d38..1ad0594 100644
+index 5755e44..42ae9fd 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -24,7 +24,7 @@ import org.bukkit.event.entity.EntityRegainHealthEvent;
@@ -340,7 +340,7 @@ index 1bd2d38..1ad0594 100644
  
  public abstract class EntityLiving extends Entity {
  
-@@ -1689,7 +1689,6 @@ public abstract class EntityLiving extends Entity {
+@@ -1690,7 +1690,6 @@ public abstract class EntityLiving extends Entity {
      }
  
      public void m() {
@@ -348,7 +348,7 @@ index 1bd2d38..1ad0594 100644
          super.m();
          this.cu();
          if (!this.world.isClientSide) {
-@@ -1762,9 +1761,7 @@ public abstract class EntityLiving extends Entity {
+@@ -1763,9 +1762,7 @@ public abstract class EntityLiving extends Entity {
              }
          }
  
@@ -358,7 +358,7 @@ index 1bd2d38..1ad0594 100644
          double d0 = this.locX - this.lastX;
          double d1 = this.locZ - this.lastZ;
          float f = (float) (d0 * d0 + d1 * d1);
-@@ -1833,8 +1830,6 @@ public abstract class EntityLiving extends Entity {
+@@ -1834,8 +1831,6 @@ public abstract class EntityLiving extends Entity {
          } else {
              this.bo = 0;
          }
@@ -367,7 +367,7 @@ index 1bd2d38..1ad0594 100644
      }
  
      protected float h(float f, float f1) {
-@@ -1899,7 +1894,6 @@ public abstract class EntityLiving extends Entity {
+@@ -1900,7 +1895,6 @@ public abstract class EntityLiving extends Entity {
          }
  
          this.world.methodProfiler.a("ai");
@@ -375,7 +375,7 @@ index 1bd2d38..1ad0594 100644
          if (this.cf()) {
              this.bc = false;
              this.bd = 0.0F;
-@@ -1910,7 +1904,6 @@ public abstract class EntityLiving extends Entity {
+@@ -1911,7 +1905,6 @@ public abstract class EntityLiving extends Entity {
              this.doTick();
              this.world.methodProfiler.b();
          }
@@ -383,7 +383,7 @@ index 1bd2d38..1ad0594 100644
  
          this.world.methodProfiler.b();
          this.world.methodProfiler.a("jump");
-@@ -1933,14 +1926,10 @@ public abstract class EntityLiving extends Entity {
+@@ -1934,14 +1927,10 @@ public abstract class EntityLiving extends Entity {
          this.be *= 0.98F;
          this.bf *= 0.9F;
          this.r();
@@ -460,7 +460,7 @@ index 5664994..eac4e79 100644
          // Run tasks that are waiting on processing
          SpigotTimings.processQueueTimer.startTiming(); // Spigot
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 39ba550..38a3abb 100644
+index 525c905..cd19408 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -58,6 +58,7 @@ import org.bukkit.inventory.CraftingInventory;

Spigot-Server-Patches/0079-Add-methods-for-working-with-arrows-stuck-in-living-.patch

@@ -1,14 +1,14 @@
-From 0b995071bedb2a68563ceba6087ca30fd007ff92 Mon Sep 17 00:00:00 2001
+From f01590c12f2fe5689ab5f98c42d8cf608237201c Mon Sep 17 00:00:00 2001
 From: mrapple <tony@oc.tc>
 Date: Sun, 25 Nov 2012 13:43:39 -0600
 Subject: [PATCH] Add methods for working with arrows stuck in living entities
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 1d5ea58..34abdd4 100644
+index 0891ff1..8be17ae 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -1270,10 +1270,12 @@ public abstract class EntityLiving extends Entity {
+@@ -1271,10 +1271,12 @@ public abstract class EntityLiving extends Entity {
          return (float) this.getAttributeInstance(GenericAttributes.maxHealth).getValue();
      }
  
@@ -43,5 +43,5 @@ index 6f25d18..693d5cb 100644
 +    // Paper end
  }
 -- 
-2.7.3
+2.7.4
 

Spigot-Server-Patches/0095-Custom-replacement-for-eaten-items.patch

@@ -1,14 +1,14 @@
-From 60b0a12eed714b7e17291eca2b28ec2cb74ad1dc Mon Sep 17 00:00:00 2001
+From a47ac50f9f616f25c470b95d7b2e8ead462326eb Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 21 Jun 2015 15:07:20 -0400
 Subject: [PATCH] Custom replacement for eaten items
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 40abc3a..3e92dcc 100644
+index 8be17ae..efeb9a0 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2214,12 +2214,25 @@ public abstract class EntityLiving extends Entity {
+@@ -2215,12 +2215,25 @@ public abstract class EntityLiving extends Entity {
              ItemStack itemstack = (craftItem.equals(event.getItem())) ? this.bm.a(this.world, this) : CraftItemStack.asNMSCopy(event.getItem()).a(world, this);
              // CraftBukkit end
  

Spigot-Server-Patches/0097-handle-NaN-health-absorb-values-and-repair-bad-data.patch

@@ -1,11 +1,11 @@
-From c35be5f9690d14316f9a296e7021dc98d9faaca2 Mon Sep 17 00:00:00 2001
+From bf7b898c3b64fe3eec538d0659a1345c736d57e5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 27 Sep 2015 01:18:02 -0400
 Subject: [PATCH] handle NaN health/absorb values and repair bad data
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 3e92dcc..cef1117 100644
+index efeb9a0..58be7c8 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -457,7 +457,13 @@ public abstract class EntityLiving extends Entity {
@@ -34,7 +34,7 @@ index 3e92dcc..cef1117 100644
          // CraftBukkit start - Handle scaled health
          if (this instanceof EntityPlayer) {
              org.bukkit.craftbukkit.entity.CraftPlayer player = ((EntityPlayer) this).getBukkitEntity();
-@@ -2084,7 +2094,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2085,7 +2095,7 @@ public abstract class EntityLiving extends Entity {
      }
  
      public void setAbsorptionHearts(float f) {
@@ -44,7 +44,7 @@ index 3e92dcc..cef1117 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 46533fb..c5879c2 100644
+index da99440..8b1daaf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1371,6 +1371,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {