Update upstream B/CB

Merges fixes for SPIGOT-2404 and SPIGOT-2408 into Paper

Spigot-Server-Patches/Entity-Origin-API.patch

@@ -127,8 +127,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingSand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingSand.java
 @@ -0,0 +0,0 @@ public class CraftFallingSand extends CraftEntity implements FallingSand {
-     public void setHurtEntities(boolean hurtEntities) {
-         getHandle().hurtEntities = hurtEntities;
+         // Second field for EntityFallingBlock
+         getHandle().ticksLived = value;
      }
 +
 +    // Paper start