Upstream merge

Bukkit

@@ -1 +1 @@
-Subproject commit 0b10b8e543444426153f48d4ec348ac15f4cf1f3
+Subproject commit b3f619f3c5ceb503c3649fe16a36b3fc90326a44

CraftBukkit

@@ -1 +1 @@
-Subproject commit 6cac62c64d8f851e0ed7c4c989cfe21cc46e7050
+Subproject commit 52c7fc0a1ab20d9fdb91dbad0285ab6a6b511079

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

@@ -1,4 +1,4 @@
-From 61881479995358ee27187c0c98b623fdd916ce2f Mon Sep 17 00:00:00 2001
+From 8ae5f231332c2baa03788b45356dd188563dd4bb 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 e20686c..f32d974 100644
+index 83e3003..25edfb8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -916,7 +916,10 @@ public class CraftWorld implements World {
+@@ -921,7 +921,10 @@ public class CraftWorld implements World {
          double y = location.getBlockY() + 0.5;
          double z = location.getBlockZ() + 0.5;
  
@@ -208,7 +208,7 @@ index e20686c..f32d974 100644
          entity.ticksLived = 1;
  
          world.addEntity(entity, SpawnReason.CUSTOM);
-@@ -952,7 +955,10 @@ public class CraftWorld implements World {
+@@ -957,7 +960,10 @@ public class CraftWorld implements World {
              int type = CraftMagicNumbers.getId(blockData.getBlock());
              int data = blockData.getBlock().toLegacyData(blockData);
  
@@ -220,7 +220,7 @@ index e20686c..f32d974 100644
          } else if (Projectile.class.isAssignableFrom(clazz)) {
              if (Snowball.class.isAssignableFrom(clazz)) {
                  entity = new EntitySnowball(world, x, y, z);
-@@ -1157,7 +1163,8 @@ public class CraftWorld implements World {
+@@ -1162,7 +1168,8 @@ public class CraftWorld implements World {
                  throw new IllegalArgumentException("Cannot spawn hanging entity for " + clazz.getName() + " at " + location);
              }
          } else if (TNTPrimed.class.isAssignableFrom(clazz)) {
@@ -263,5 +263,5 @@ index c493c9c..eea3238 100644
 +    // Paper end
  }
 -- 
-2.7.2
+2.7.2.windows.1