Update upstream B/CB/Spigot and rebuild

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

@@ -9,15 +9,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -0,0 +0,0 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
-      * @return true if the entity has AI, otherwise false.
+      * @return collision status
       */
-     boolean hasAI();
+     boolean isCollidable();
 +
 +    // Paper start
-+
 +    /**
 +     * Get the number of arrows stuck in this entity
-+     * * @return Number of arrows stuck
++     * @return Number of arrows stuck
 +     */
 +    int getArrowsStuck();
 +

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

@@ -26,8 +26,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -0,0 +0,0 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
-     public boolean hasAI() {
-         return (this.getHandle() instanceof EntityInsentient) ? !((EntityInsentient) this.getHandle()).cR() : false; // PAIL: rename
+     public boolean isCollidable() {
+         return getHandle().collides;
      }
 +
 +    // Paper start