diff --git a/Spigot-Server-Patches/0185-IllegalPacketEvent.patch b/Spigot-Server-Patches/0185-IllegalPacketEvent.patch
index 06d1b348d0..750086930d 100644
--- a/Spigot-Server-Patches/0185-IllegalPacketEvent.patch
+++ b/Spigot-Server-Patches/0185-IllegalPacketEvent.patch
@@ -1,4 +1,4 @@
-From 94325356fde629d45e054726494f870b871a964a Mon Sep 17 00:00:00 2001
+From 5bea86c4a8652cb0ced1c338dae4141495bd9370 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 23 Jun 2016 23:33:57 -0400
 Subject: [PATCH] IllegalPacketEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] IllegalPacketEvent
 Fired for invalid data from players that represents hacking attempts
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index dbd9d30b9..d963abc9a 100644
+index 98a63dc0e..f82a81178 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -56,6 +56,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -17,7 +17,7 @@ index dbd9d30b9..d963abc9a 100644
  import co.aikar.timings.MinecraftTimings; // Paper
  // CraftBukkit end
  
-@@ -2281,8 +2282,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2282,8 +2283,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                      CraftEventFactory.handleEditBookEvent(player, itemstack1); // CraftBukkit
                  }
              } catch (Exception exception) {
@@ -27,7 +27,7 @@ index dbd9d30b9..d963abc9a 100644
              }
          } else {
              String s1;
-@@ -2331,8 +2331,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2332,8 +2332,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                          CraftEventFactory.handleEditBookEvent(player, itemstack2); // CraftBukkit
                      }
                  } catch (Exception exception1) {
@@ -37,7 +37,7 @@ index dbd9d30b9..d963abc9a 100644
                  }
              } else if ("MC|TrSel".equals(s)) {
                  try {
-@@ -2343,8 +2342,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2344,8 +2343,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                          ((ContainerMerchant) container).d(j);
                      }
                  } catch (Exception exception2) {
@@ -47,7 +47,7 @@ index dbd9d30b9..d963abc9a 100644
                  }
              } else {
                  TileEntity tileentity;
-@@ -2485,8 +2483,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2486,8 +2484,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                                      iinventory.update();
                                  }
                              } catch (Exception exception5) {
@@ -57,7 +57,7 @@ index dbd9d30b9..d963abc9a 100644
                              }
                          }
                      } else if ("MC|ItemName".equals(s)) {
-@@ -2585,8 +2582,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2586,8 +2583,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                              this.player.playerConnection.sendPacket(new PacketPlayOutSetSlot(-2, k, this.player.inventory.getItem(k)));
                              this.player.playerConnection.sendPacket(new PacketPlayOutHeldItemSlot(this.player.inventory.itemInHandIndex));
                          } catch (Exception exception7) {
diff --git a/Spigot-Server-Patches/0186-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0186-Properly-fix-item-duplication-bug.patch
index 16aca19183..75fdf9f55e 100644
--- a/Spigot-Server-Patches/0186-Properly-fix-item-duplication-bug.patch
+++ b/Spigot-Server-Patches/0186-Properly-fix-item-duplication-bug.patch
@@ -1,4 +1,4 @@
-From 6fe4f5078fe35089db4a9e52d729d387e4934225 Mon Sep 17 00:00:00 2001
+From 708d31da9dd0f79c0e0148ad106156691041b08a Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Tue, 27 Dec 2016 01:57:57 +0000
 Subject: [PATCH] Properly fix item duplication bug
@@ -19,10 +19,10 @@ index 53147c6e2..5fbb99b7e 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index d963abc9a..dd6cbe947 100644
+index f82a81178..1dc9ddbb5 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2625,6 +2625,6 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2626,6 +2626,6 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
  
      // CraftBukkit start - Add "isDisconnected" method
      public final boolean isDisconnected() {
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 9a1f5ee80a..94b0980852 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 9a1f5ee80a8665b0c388758003e2bda1ee924084
+Subproject commit 94b098085269b86ae8f926fe64e06fa3fbe6a7ca