Update Upstream

Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch

@@ -1,11 +1,11 @@
-From d8be66ef36bc2d6b2a7581eeee0ccbe567ff0716 Mon Sep 17 00:00:00 2001
+From 3d62f02e2b5e03a136cfc8ee51b88e42221fd595 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 May 2017 06:26:01 -0500
 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
 @@ -17,6 +17,7 @@ import org.jetbrains.annotations.NotNull;
@@ -16,7 +16,7 @@ index c7599116..5777d380 100644
      private boolean cancel = false;
      private final int remaining;
  
-@@ -45,12 +46,34 @@ public class PlayerPickupItemEvent extends PlayerEvent implements Cancellable {
+@@ -45,6 +46,27 @@ public class PlayerPickupItemEvent extends PlayerEvent implements Cancellable {
          return remaining;
      }
  
@@ -41,10 +41,11 @@ index c7599116..5777d380 100644
 +    }
 +    // Paper End
 +
+     @Override
      public boolean isCancelled() {
          return cancel;
-     }
- 
+@@ -53,6 +75,7 @@ public class PlayerPickupItemEvent extends PlayerEvent implements Cancellable {
+     @Override
      public void setCancelled(boolean cancel) {
          this.cancel = cancel;
 +        this.flyAtPlayer = !cancel; // Paper