Update Upstream

Spigot-API-Patches/PlayerPickupItemEvent-setFlyAtPlayer.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer
 
 
 diff --git a/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java b/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java
-index c7599116..5777d380 100644
+index 951ea2cc..18d82c11 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java
 @@ -0,0 +0,0 @@ import org.jetbrains.annotations.NotNull;
@@ -41,10 +41,11 @@ index c7599116..5777d380 100644
 +    }
 +    // Paper End
 +
+     @Override
      public boolean isCancelled() {
          return cancel;
-     }
- 
+@@ -0,0 +0,0 @@ public class PlayerPickupItemEvent extends PlayerEvent implements Cancellable {
+     @Override
      public void setCancelled(boolean cancel) {
          this.cancel = cancel;
 +        this.flyAtPlayer = !cancel; // Paper