Update upstream B/CB/S

Spigot-API-Patches/Arrow-pickup-rule-API.patch

@@ -5,13 +5,14 @@ Subject: [PATCH] Arrow pickup rule API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Arrow.java b/src/main/java/org/bukkit/entity/Arrow.java
-index 1ff09518..da4678d0 100644
+index 5850ab6c..a8d1826a 100644
 --- a/src/main/java/org/bukkit/entity/Arrow.java
 +++ b/src/main/java/org/bukkit/entity/Arrow.java
 @@ -0,0 +0,0 @@ public interface Arrow extends Projectile {
-         CREATIVE_ONLY
-     }
- 
+     @Override
+     Spigot spigot();
+     // Spigot end
++
 +    // Paper start
 +    /**
 +     * Gets the {@link PickupRule} for this arrow.
@@ -45,8 +46,5 @@ index 1ff09518..da4678d0 100644
 +        CREATIVE_ONLY;
 +    }
 +    // Paper end
-+
-     public class Spigot extends Entity.Spigot
-     {
- 
+ }
 --