Update upstream and rebuild patches

Bukkit

@@ -1 +1 @@
-Subproject commit 032d1ff804d2a123e1a10d1917ba4c955a910e1e
+Subproject commit 650ae8fbe37371aaabb503fee614ec7e3193635d

CraftBukkit

@@ -1 +1 @@
-Subproject commit 1fefbf9b988be4173df80888d1928418243efec8
+Subproject commit 4a8818c5fd4be406c59b518b86f10f39b4e6dcdd

Spigot-Server-Patches/0023-Add-async-chunk-load-API.patch

@@ -1,14 +1,14 @@
-From 1d8176a9fe0d15eaf957171d91fc1dd83b8812ca Mon Sep 17 00:00:00 2001
+From de7fdfa43bb0fb61b21daa5c920a570899909295 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 23:19:01 -0600
 Subject: [PATCH] Add async chunk load API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index b06f167..fcf5a0e 100644
+index e0b1c0c..e20686c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -121,6 +121,26 @@ public class CraftWorld implements World {
+@@ -124,6 +124,26 @@ public class CraftWorld implements World {
          }
      }
  

Spigot-Server-Patches/0024-FallingBlock-and-TNTPrimed-source-location-API.patch

@@ -1,4 +1,4 @@
-From 28d69ac776319cd7076c8ccb9ad9ed4bea38bfbb Mon Sep 17 00:00:00 2001
+From 61881479995358ee27187c0c98b623fdd916ce2f Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 23:45:08 -0600
 Subject: [PATCH] FallingBlock and TNTPrimed source location API
@@ -193,10 +193,10 @@ index 564ea37..1820c7b 100644
  
      public EntityLiving getSource() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index fcf5a0e..6c3f615 100644
+index e20686c..f32d974 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -899,7 +899,10 @@ public class CraftWorld implements World {
+@@ -916,7 +916,10 @@ public class CraftWorld implements World {
          double y = location.getBlockY() + 0.5;
          double z = location.getBlockZ() + 0.5;
  
@@ -208,7 +208,7 @@ index fcf5a0e..6c3f615 100644
          entity.ticksLived = 1;
  
          world.addEntity(entity, SpawnReason.CUSTOM);
-@@ -935,7 +938,10 @@ public class CraftWorld implements World {
+@@ -952,7 +955,10 @@ public class CraftWorld implements World {
              int type = CraftMagicNumbers.getId(blockData.getBlock());
              int data = blockData.getBlock().toLegacyData(blockData);
  
@@ -220,7 +220,7 @@ index fcf5a0e..6c3f615 100644
          } else if (Projectile.class.isAssignableFrom(clazz)) {
              if (Snowball.class.isAssignableFrom(clazz)) {
                  entity = new EntitySnowball(world, x, y, z);
-@@ -1130,7 +1136,8 @@ public class CraftWorld implements World {
+@@ -1157,7 +1163,8 @@ public class CraftWorld implements World {
                  throw new IllegalArgumentException("Cannot spawn hanging entity for " + clazz.getName() + " at " + location);
              }
          } else if (TNTPrimed.class.isAssignableFrom(clazz)) {

Spigot-Server-Patches/0053-Don-t-create-a-chunk-just-to-unload-it.patch

@@ -1,14 +1,14 @@
-From b78df4d225b0a403b0359704388c686283d4983e Mon Sep 17 00:00:00 2001
+From 68fa0ceea005bce4c5b6ec29ac6895b6d9ab6380 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 2 Mar 2016 23:55:20 -0600
 Subject: [PATCH] Don't create a chunk just to unload it
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 24ecfae..68b4c6c 100644
+index f32d974..40338c0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -202,7 +202,12 @@ public class CraftWorld implements World {
+@@ -205,7 +205,12 @@ public class CraftWorld implements World {
              return false;
          }
  

Spigot-Server-Patches/0056-Process-Entity-Chunk-Registration-on-Teleport.patch

@@ -1,4 +1,4 @@
-From 84a31df3c679fddff1bacbb673751e2516e2ad23 Mon Sep 17 00:00:00 2001
+From 85da9e1e002a07a334b87d47c7d618e152204c8b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 00:12:23 -0600
 Subject: [PATCH] Process Entity Chunk Registration on Teleport
@@ -6,10 +6,10 @@ Subject: [PATCH] Process Entity Chunk Registration on Teleport
 Fixes many issues with entities not being properly "switched" to their new chunk on teleport
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 9a1c9f0..4cc45f6 100644
+index f80ac2c..3d9a454 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -245,6 +245,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -252,6 +252,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          // entity.world = ((CraftWorld) location.getWorld()).getHandle();
          // Spigot end
          entity.setLocation(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());

Spigot-Server-Patches/0067-Be-a-bit-more-informative-in-maxHealth-exception.patch

@@ -1,14 +1,14 @@
-From 919e7babbeed909d2b51a4e1764f673cd1132070 Mon Sep 17 00:00:00 2001
+From 9b1dee4b1052c97a2da69e7879755b657661a126 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 3 Mar 2016 02:18:39 -0600
 Subject: [PATCH] Be a bit more informative in maxHealth exception
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index e8aff90..ebf378b 100644
+index c17b614..5e1aec2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -85,7 +85,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -92,7 +92,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
  
      public void setHealth(double health) {
          if ((health < 0) || (health > getMaxHealth())) {

Spigot-Server-Patches/0073-Add-velocity-warnings.patch

@@ -1,14 +1,14 @@
-From 9847b8d2a13d30029cee4553416c745d6a8b237c Mon Sep 17 00:00:00 2001
+From 50d16f00aebd32ed2bf51b7ede8655df5f7eb78a Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:48:12 -0600
 Subject: [PATCH] Add velocity warnings
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 4cc45f6..c988e93 100644
+index 3d9a454..cb28a8c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -207,6 +207,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -214,6 +214,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      }
  
      public void setVelocity(Vector vel) {

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

@@ -1,11 +1,11 @@
-From 75bad843fd7489be586bd503a4e6f4155f13474a Mon Sep 17 00:00:00 2001
+From cccaa58b370ea1d06cb7c18f9c635dd0a91085e6 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 b10475f..37d877e 100644
+index 015caa7..946c925 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1264,10 +1264,12 @@ public abstract class EntityLiving extends Entity {
@@ -22,10 +22,10 @@ index b10475f..37d877e 100644
          this.datawatcher.set(EntityLiving.h, Integer.valueOf(i));
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index ebf378b..c9564bd 100644
+index 5e1aec2..95965fd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -503,4 +503,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -521,4 +521,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      public AttributeInstance getAttribute(Attribute attribute) {
          return getHandle().craftAttributes.getAttribute(attribute);
      }