Update upstream B/CB/S

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

@@ -1,16 +1,16 @@
-From e66a13a63d87c0064d5ae21c8c5215f2d2433212 Mon Sep 17 00:00:00 2001
+From 17223e9ba60ecfb981e037bcc62018b428d71808 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 e7a32f7..08095b9 100644
+index 1ff0951..da4678d 100644
 --- a/src/main/java/org/bukkit/entity/Arrow.java
 +++ b/src/main/java/org/bukkit/entity/Arrow.java
-@@ -40,6 +40,31 @@ public interface Arrow extends Projectile {
-      */
-     public void setCritical(boolean critical);
+@@ -72,6 +72,40 @@ public interface Arrow extends Projectile {
+         CREATIVE_ONLY
+     }
  
 +    // Paper start
 +    /**
@@ -20,16 +20,25 @@ index e7a32f7..08095b9 100644
 +     * <b>not</b> fired from a bow with the infinity enchantment.</p>
 +     *
 +     * @return The pickup rule
++     * @deprecated Use {@link Arrow#getPickupStatus()} as an upstream compatible replacement for this function
 +     */
-+    PickupRule getPickupRule();
++    @Deprecated
++    default PickupRule getPickupRule() {
++        return PickupRule.valueOf(this.getPickupStatus().name());
++    }
 +
 +    /**
 +     * Set the rule for which players can pickup this arrow as an item.
 +     *
 +     * @param rule The pickup rule
++     * @deprecated Use {@link Arrow#setPickupStatus(PickupStatus)} with {@link PickupStatus} as an upstream compatible replacement for this function
 +     */
-+    void setPickupRule(PickupRule rule);
++    @Deprecated
++    default void setPickupRule(PickupRule rule) {
++        this.setPickupStatus(PickupStatus.valueOf(rule.name()));
++    }
 +
++    @Deprecated
 +    enum PickupRule {
 +        DISALLOWED,
 +        ALLOWED,