Update upstream B/CB/S

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

@@ -1,17 +1,18 @@
-From 5f3ad3c3d105730323ea950c36892c1c548f4437 Mon Sep 17 00:00:00 2001
+From b3c6eea6591a465f977f69067e464599a533209b Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Fri, 4 Mar 2016 03:13:18 -0500
 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
-@@ -72,6 +72,40 @@ public interface Arrow extends Projectile {
-         CREATIVE_ONLY
-     }
- 
+@@ -90,4 +90,38 @@ public interface Arrow extends Projectile {
+     @Override
+     Spigot spigot();
+     // Spigot end
++
 +    // Paper start
 +    /**
 +     * Gets the {@link PickupRule} for this arrow.
@@ -45,10 +46,7 @@ index 1ff09518..da4678d0 100644
 +        CREATIVE_ONLY;
 +    }
 +    // Paper end
-+
-     public class Spigot extends Entity.Spigot
-     {
- 
+ }
 -- 
-2.12.2
+2.13.0