Upstream merge CB, rebuild patch

CraftBukkit

@@ -1 +1 @@
-Subproject commit 8b61cc52088ccb9220970740a4905baf3781a680
+Subproject commit 6247aa00cc50cff563dc17811db1c3f4a9f1487c

Spigot-Server-Patches/0013-Player-Exhaustion-Multipliers.patch

@@ -1,4 +1,4 @@
-From f0625a47f413e8273fc06aab8a6dacc7031dd6da Mon Sep 17 00:00:00 2001
+From 20f4010aef693e1da12b34b5322ecedac5abb53c Mon Sep 17 00:00:00 2001
 From: gsand <gsandowns@gmail.com>
 Date: Tue, 1 Mar 2016 13:43:16 -0600
 Subject: [PATCH] Player Exhaustion Multipliers
@@ -36,10 +36,10 @@ index 88e1e98..0f71013 100644
              ItemStack itemstack1 = this.u(iblockdata);
  
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index e8c13ea..8e143f7 100644
+index e1bb5c5..11388ab 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -1448,13 +1448,13 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -1451,13 +1451,13 @@ public abstract class EntityHuman extends EntityLiving {
                  i = Math.round(MathHelper.sqrt(d0 * d0 + d1 * d1 + d2 * d2) * 100.0F);
                  if (i > 0) {
                      this.a(StatisticList.q, i);