Update Upstream

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

@@ -1,14 +1,14 @@
-From a53027c798480be3017e4e592c0f8667e63bc612 Mon Sep 17 00:00:00 2001
+From 409f5510dda42a7cfd18698436fc766df133c4e2 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 29f03f5d..da19009b 100644
+index c76f423e..46c6d519 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java
-@@ -14,6 +14,7 @@ import org.bukkit.event.entity.EntityPickupItemEvent;
+@@ -16,6 +16,7 @@ import org.bukkit.event.entity.EntityPickupItemEvent;
  public class PlayerPickupItemEvent extends PlayerEvent implements Cancellable {
      private static final HandlerList handlers = new HandlerList();
      private final Item item;
@@ -16,7 +16,7 @@ index 29f03f5d..da19009b 100644
      private boolean cancel = false;
      private final int remaining;
  
-@@ -41,12 +42,34 @@ public class PlayerPickupItemEvent extends PlayerEvent implements Cancellable {
+@@ -43,12 +44,34 @@ public class PlayerPickupItemEvent extends PlayerEvent implements Cancellable {
          return remaining;
      }
  
@@ -52,5 +52,5 @@ index 29f03f5d..da19009b 100644
  
      @Override
 -- 
-2.13.3
+2.13.0
 

Spigot-Server-Patches/0223-Fix-Recipe-Books.patch

@@ -1,11 +1,11 @@
-From 9f86985393516537a52bbe0b3a899df08c65410e Mon Sep 17 00:00:00 2001
+From 69aecad8ffaaa88760f8c3b0b152cc80ec669eb0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 26 Jul 2017 21:12:15 -0400
 Subject: [PATCH] Fix Recipe Books
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 682211cdd..5b9021939 100644
+index 682211cdd..034081cbe 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2027,12 +2027,6 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -21,20 +21,29 @@ index 682211cdd..5b9021939 100644
          if (this.player.activeContainer.windowId == packetplayinautorecipe.a() && this.player.activeContainer.c(this.player)) {
              this.player.playerConnection.sendPacket(new PacketPlayOutTransaction(packetplayinautorecipe.a(), packetplayinautorecipe.b(), true));
              Iterator iterator;
-@@ -2046,7 +2040,11 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2046,10 +2040,19 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                  while (iterator.hasNext()) {
                      packetplayinautorecipe_a = (PacketPlayInAutoRecipe.a) iterator.next();
                      itemstack = this.player.activeContainer.getSlot(packetplayinautorecipe_a.b).getItem();
 -                    if (this.a(packetplayinautorecipe_a.a, itemstack)) {
 +                    // Paper start - improve validation
-+                    ItemStack to = this.player.inventory.getItem(packetplayinautorecipe_a.c);
++                    int toSlot = packetplayinautorecipe_a.c;
++                    ItemStack to = toSlot != -1 ? this.player.inventory.getItem(toSlot) : ItemStack.a;
 +                    ItemStack ref = packetplayinautorecipe_a.a;
 +                    if (this.a(ref, itemstack) && (to.isEmpty() || this.a(ref, to)) && (ref.getCount() + to.getCount() <= ref.getMaxStackSize())) {
 +                        // Paper end
                          i = packetplayinautorecipe_a.a.getCount();
                          if (packetplayinautorecipe_a.c == -1) {
-                             this.player.drop(packetplayinautorecipe_a.a, true);
+-                            this.player.drop(packetplayinautorecipe_a.a, true);
-@@ -2066,6 +2064,12 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
++                            // Paper start
++                            this.player.drop(itemstack, true);
++                            this.player.activeContainer.setItem(packetplayinautorecipe_a.b, ItemStack.a);
++                            continue;
++                            // Paper end
+                         } else {
+                             ItemStack itemstack1 = this.player.inventory.getItem(packetplayinautorecipe_a.c);
+ 
+@@ -2066,6 +2069,12 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                              itemstack.subtract(i);
                          }
                      }
@@ -47,7 +56,7 @@ index 682211cdd..5b9021939 100644
                  }
              }
  
-@@ -2075,7 +2079,11 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2075,7 +2084,11 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                  while (iterator.hasNext()) {
                      packetplayinautorecipe_a = (PacketPlayInAutoRecipe.a) iterator.next();
                      itemstack = this.player.inventory.getItem(packetplayinautorecipe_a.c);
@@ -55,12 +64,12 @@ index 682211cdd..5b9021939 100644
 +                    // Paper start
 +                    ItemStack ref = packetplayinautorecipe_a.a;
 +                    ItemStack to = this.player.activeContainer.getSlot(packetplayinautorecipe_a.b).getItem();
-+                    if (this.a(ref, itemstack) && (ref.getCount() + to.getCount() <= ref.getMaxStackSize())) {
++                    if (this.a(ref, itemstack) && (to.isEmpty() || this.a(ref, to)) && (ref.getCount() + to.getCount() <= ref.getMaxStackSize())) {
 +                        // Paper end
                          i = packetplayinautorecipe_a.a.getCount();
                          if (itemstack.getCount() == i) {
                              this.player.inventory.splitWithoutUpdate(packetplayinautorecipe_a.c);
-@@ -2083,8 +2091,17 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2083,8 +2096,17 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                              itemstack.subtract(i);
                          }
  
@@ -80,5 +89,5 @@ index 682211cdd..5b9021939 100644
              }
  
 -- 
-2.13.3
+2.13.0
 

work/Bukkit

@@ -1 +1 @@
-Subproject commit a4b56a40cf4830115938b1caf9e33c087edefd2d
+Subproject commit 0ce77bc4b3825b1665b34f7dd6dc4b01a02e9443