Update upstream CB

Spigot-Server-Patches/0006-Timings-v2.patch

@@ -1,4 +1,4 @@
-From 36765f132f5118529188d2241f558a3081793d08 Mon Sep 17 00:00:00 2001
+From a64b953c1a3a0081b9c5ec59a1c00c53b090ff30 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
@@ -607,7 +607,7 @@ index 7fe2796fe..2feeb855b 100644
              return waitable.get();
          } catch (java.util.concurrent.ExecutionException e) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index e3e9a2136..000a0051f 100644
+index 38fb9104f..66e707b71 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -25,7 +25,8 @@ import org.bukkit.block.BlockFace;
@@ -995,7 +995,7 @@ index eeac34998..e4ed2e991 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index ddd36a3c6..42b05bee8 100644
+index 70ddf9250..f7326aeec 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;
@@ -1660,7 +1660,7 @@ index 3a95b4465..b5efb9c3f 100644
  
      public void callStage3(QueuedChunk queuedChunk, Chunk chunk, Runnable runnable) throws RuntimeException {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 001b6040f..d4c8fafe7 100644
+index ca138fa65..d38900887 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -38,7 +38,7 @@ import org.bukkit.configuration.serialization.DelegateDeserialization;
@@ -1672,7 +1672,7 @@ index 001b6040f..d4c8fafe7 100644
  import org.bukkit.craftbukkit.block.CraftSign;
  import org.bukkit.craftbukkit.conversations.ConversationTracker;
  import org.bukkit.craftbukkit.CraftEffect;
-@@ -1595,6 +1595,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1625,6 +1625,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              packet.components = components;
              getHandle().playerConnection.sendPacket(packet);
          }
@@ -1918,5 +1918,5 @@ index 2bd690fdf..38be7ed71 100644
      }
  }
 -- 
-2.13.0
+2.13.3.windows.1
 

Spigot-Server-Patches/0017-Player-affects-spawning-API.patch

@@ -1,11 +1,11 @@
-From 0e729e406610f5d057c235a68bb6ba79dd108b90 Mon Sep 17 00:00:00 2001
+From f77708a67bce0f76232043c1b3885946578d938b Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Tue, 1 Mar 2016 14:47:52 -0600
 Subject: [PATCH] Player affects spawning API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index b8479d9c..e9509e61 100644
+index b8479d9cf..e9509e618 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -64,6 +64,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -17,7 +17,7 @@ index b8479d9c..e9509e61 100644
      // CraftBukkit start
      public boolean fauxSleeping;
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 0c2f7e1d..b594602a 100644
+index 971267b32..1429beb59 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -614,7 +614,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -30,7 +30,7 @@ index 0c2f7e1d..b594602a 100644
                  double d1 = entityhuman.locY - this.locY;
                  double d2 = entityhuman.locZ - this.locZ;
 diff --git a/src/main/java/net/minecraft/server/EntitySilverfish.java b/src/main/java/net/minecraft/server/EntitySilverfish.java
-index 50bca48b..57552c52 100644
+index 50bca48bf..57552c522 100644
 --- a/src/main/java/net/minecraft/server/EntitySilverfish.java
 +++ b/src/main/java/net/minecraft/server/EntitySilverfish.java
 @@ -99,8 +99,7 @@ public class EntitySilverfish extends EntityMonster {
@@ -44,7 +44,7 @@ index 50bca48b..57552c52 100644
              return false;
          }
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index a599a043..1c7c187c 100644
+index a599a043d..1c7c187c7 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -52,7 +52,7 @@ public final class SpawnerCreature {
@@ -57,7 +57,7 @@ index a599a043..1c7c187c 100644
  
                      j = MathHelper.floor(entityhuman.locZ / 16.0D);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index d6d8cd90..9e505cce 100644
+index d6d8cd90e..9e505cce4 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -2735,7 +2735,7 @@ public abstract class World implements IBlockAccess {
@@ -70,10 +70,10 @@ index d6d8cd90..9e505cce 100644
  
                  if (d3 < 0.0D || d4 < d3 * d3) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d4c8fafe..49f91a8c 100644
+index d38900887..939233ef7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1458,6 +1458,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1488,6 +1488,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      @Override
      public String getLocale() {
          return getHandle().locale;
@@ -91,5 +91,5 @@ index d4c8fafe..49f91a8c 100644
  
      // Spigot start
 -- 
-2.13.1.windows.2
+2.13.3.windows.1
 

Spigot-Server-Patches/0021-Only-refresh-abilities-if-needed.patch

@@ -1,14 +1,14 @@
-From 63bffaf28a488fabf6686ffa189e2412c163e9c6 Mon Sep 17 00:00:00 2001
+From 0ca1499a6e2f0595817058a6e72134d24298ed3a Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 23:12:03 -0600
 Subject: [PATCH] Only refresh abilities if needed
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 4f80d0443..b451be916 100644
+index 939233ef7..b7203df1b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1160,12 +1160,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1190,12 +1190,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setFlying(boolean value) {
@@ -24,5 +24,5 @@ index 4f80d0443..b451be916 100644
  
      @Override
 -- 
-2.13.0.windows.1
+2.13.3.windows.1
 

Spigot-Server-Patches/0036-Add-player-view-distance-API.patch

@@ -1,11 +1,11 @@
-From 2f1f22b6f64f1784e0b7863c8a87bd65728cabeb Mon Sep 17 00:00:00 2001
+From db3e5eb562d844d6bfa7dd145b0284b5fcac8566 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 14:35:27 -0600
 Subject: [PATCH] Add player view distance API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index efce9048b..76588e4a2 100644
+index 480057110..e4a16867e 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -66,6 +66,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -194,10 +194,10 @@ index e4ed2e991..cfac05750 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b451be916..3c39751a0 100644
+index b7203df1b..c1dfcf103 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1471,6 +1471,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1501,6 +1501,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.getHandle().affectsSpawning;
      }
  
@@ -215,5 +215,5 @@ index b451be916..3c39751a0 100644
      private final Player.Spigot spigot = new Player.Spigot()
      {
 -- 
-2.13.0
+2.13.3.windows.1
 

Spigot-Server-Patches/0060-Fix-inter-world-teleportation-glitches.patch

@@ -1,4 +1,4 @@
-From 2d6cd8264050283d165c92ead582c3b97bc1f74b Mon Sep 17 00:00:00 2001
+From afe4ec1115ea71e3dfd24727f188cf06a71aec92 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Thu, 3 Mar 2016 02:50:31 -0600
 Subject: [PATCH] Fix inter-world teleportation glitches
@@ -25,10 +25,10 @@ index 4cc74cd65..fa49397ea 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index fe40c51a4..eb7bdd222 100644
+index b54da3211..7e95ec70f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -586,7 +586,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -616,7 +616,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          if (fromWorld == toWorld) {
              entity.playerConnection.teleport(to);
          } else {
@@ -39,5 +39,5 @@ index fe40c51a4..eb7bdd222 100644
          return true;
      }
 -- 
-2.13.0.windows.1
+2.13.3.windows.1
 

Spigot-Server-Patches/0065-Complete-resource-pack-API.patch

@@ -1,11 +1,11 @@
-From 6760ed6dd99f5c9b6b3d710f2b5eea76714b5408 Mon Sep 17 00:00:00 2001
+From 32797ba6bb12cc69a872089e579167488676c3d9 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 4 Apr 2015 23:17:52 -0400
 Subject: [PATCH] Complete resource pack API
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index a8c10d3b0..cef07eb1b 100644
+index cd88ae7b7..2c4f8e311 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1060,7 +1060,12 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -23,7 +23,7 @@ index a8c10d3b0..cef07eb1b 100644
      // CraftBukkit end
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index eb7bdd222..ab164c11e 100644
+index 7e95ec70f..d5c53032a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -81,6 +81,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -37,7 +37,7 @@ index eb7bdd222..ab164c11e 100644
  
      public CraftPlayer(CraftServer server, EntityPlayer entity) {
          super(server, entity);
-@@ -1562,6 +1566,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1592,6 +1596,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          ((WorldServer) getHandle().world).getPlayerChunkMap().updateViewDistance(getHandle(), viewDistance);
      }
  
@@ -71,5 +71,5 @@ index eb7bdd222..ab164c11e 100644
      private final Player.Spigot spigot = new Player.Spigot()
      {
 -- 
-2.13.0
+2.13.3.windows.1
 

Spigot-Server-Patches/0079-handle-NaN-health-absorb-values-and-repair-bad-data.patch

@@ -1,4 +1,4 @@
-From 8bfcb4fc727ef2d3720eb23140d6e07757d1f147 Mon Sep 17 00:00:00 2001
+From 111fec9a616acae288907d783fc78ace63ed49ae Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 27 Sep 2015 01:18:02 -0400
 Subject: [PATCH] handle NaN health/absorb values and repair bad data
@@ -44,10 +44,10 @@ index 83c55dff6..e9552ff21 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 03faaf143..74944159a 100644
+index d5c53032a..350881752 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1384,6 +1384,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1414,6 +1414,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void setRealHealth(double health) {
@@ -56,5 +56,5 @@ index 03faaf143..74944159a 100644
      }
  
 -- 
-2.13.0
+2.13.3.windows.1
 

Spigot-Server-Patches/0108-Workaround-for-setting-passengers-on-players.patch

@@ -1,4 +1,4 @@
-From 285964ae5235a341b20a8de6830cf72c958f4806 Mon Sep 17 00:00:00 2001
+From a52709629d04ad6a8b18b71154bbcf162fa549d2 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 10 Apr 2016 03:23:32 -0500
 Subject: [PATCH] Workaround for setting passengers on players
@@ -6,10 +6,10 @@ Subject: [PATCH] Workaround for setting passengers on players
 SPIGOT-1915 & GH-114
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 74944159..747de51d 100644
+index 350881752..17a14fdc0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -596,6 +596,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -626,6 +626,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return true;
      }
  
@@ -28,5 +28,5 @@ index 74944159..747de51d 100644
      public void setSneaking(boolean sneak) {
          getHandle().setSneaking(sneak);
 -- 
-2.13.1.windows.2
+2.13.3.windows.1
 

Spigot-Server-Patches/0117-Implement-PlayerLocaleChangeEvent.patch

@@ -1,11 +1,11 @@
-From afa6cc4ed26e421d7f4f9d10487359ab0a182602 Mon Sep 17 00:00:00 2001
+From f27f5cde237dc3ea61e03600d2ad87315dc29931 Mon Sep 17 00:00:00 2001
 From: Isaac Moore <rmsy@me.com>
 Date: Tue, 19 Apr 2016 14:09:31 -0500
 Subject: [PATCH] Implement PlayerLocaleChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 95336d6c..1bc2ed0e 100644
+index ccd4cabcd..6271d28a2 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -31,7 +31,7 @@ import org.bukkit.inventory.MainHand;
@@ -45,10 +45,10 @@ index 95336d6c..1bc2ed0e 100644
          this.cm = packetplayinsettings.d();
          this.getDataWatcher().set(EntityPlayer.br, Byte.valueOf((byte) packetplayinsettings.e()));
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 747de51d..2569f0b7 100644
+index 17a14fdc0..b65ac0c7e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1693,7 +1693,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1723,7 +1723,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          @Override
          public String getLocale()
          {
@@ -60,5 +60,5 @@ index 747de51d..2569f0b7 100644
  
          @Override
 -- 
-2.13.1.windows.2
+2.13.3.windows.1
 

Spigot-Server-Patches/0185-IllegalPacketEvent.patch

@@ -1,4 +1,4 @@
-From 6be5a80eabb55c812e5141ad910ccef1b477eff7 Mon Sep 17 00:00:00 2001
+From 0b6115f9ec3330027efb0650f51b104310c2aff8 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 2df4e5a4..9e1870f3 100644
+index 578837b53..dc92454ce 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 2df4e5a4..9e1870f3 100644
  import co.aikar.timings.MinecraftTimings; // Paper
  // CraftBukkit end
  
-@@ -2336,8 +2337,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2342,8 +2343,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                      CraftEventFactory.handleEditBookEvent(player, itemstack1); // CraftBukkit
                  }
              } catch (Exception exception) {
@@ -27,7 +27,7 @@ index 2df4e5a4..9e1870f3 100644
              }
          } else {
              String s1;
-@@ -2386,8 +2386,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2392,8 +2392,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                          CraftEventFactory.handleEditBookEvent(player, itemstack2); // CraftBukkit
                      }
                  } catch (Exception exception1) {
@@ -37,7 +37,7 @@ index 2df4e5a4..9e1870f3 100644
                  }
              } else if ("MC|TrSel".equals(s)) {
                  try {
-@@ -2398,8 +2397,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2404,8 +2403,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                          ((ContainerMerchant) container).d(j);
                      }
                  } catch (Exception exception2) {
@@ -47,7 +47,7 @@ index 2df4e5a4..9e1870f3 100644
                  }
              } else {
                  TileEntity tileentity;
-@@ -2540,8 +2538,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2546,8 +2544,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                                      iinventory.update();
                                  }
                              } catch (Exception exception5) {
@@ -57,7 +57,7 @@ index 2df4e5a4..9e1870f3 100644
                              }
                          }
                      } else if ("MC|ItemName".equals(s)) {
-@@ -2640,8 +2637,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2646,8 +2643,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) {
@@ -68,5 +68,5 @@ index 2df4e5a4..9e1870f3 100644
                      }
                      // CraftBukkit start
 -- 
-2.13.1.windows.2
+2.13.3.windows.1
 

Spigot-Server-Patches/0186-Properly-fix-item-duplication-bug.patch

@@ -1,4 +1,4 @@
-From 346cec2986ddbffbb85c4f22327dd5008ccd7e97 Mon Sep 17 00:00:00 2001
+From 2724841a28fe26897b65b535824aefcd1aa4f646 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Properly fix item duplication bug
 Credit to prplz for figuring out the real issue
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index df2e607d..13dd3dea 100644
+index dc4d08fd4..354cbadb0 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1491,7 +1491,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -19,10 +19,10 @@ index df2e607d..13dd3dea 100644
  
      public void reset() {
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 9e1870f3..54c60717 100644
+index dc92454ce..c3309bc57 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2680,6 +2680,6 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2686,6 +2686,6 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
  
      // CraftBukkit start - Add "isDisconnected" method
      public final boolean isDisconnected() {
@@ -31,5 +31,5 @@ index 9e1870f3..54c60717 100644
      }
  }
 -- 
-2.13.1.windows.2
+2.13.3.windows.1
 

Spigot-Server-Patches/0222-Fix-Anvil-Level-sync-to-client.patch

@@ -1,4 +1,4 @@
-From 47043a09799165938f5ebee4b3b18fc99ec22aea Mon Sep 17 00:00:00 2001
+From 361c8249bde5116c72bc4ddf10d1fba1d9645b1b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 11 Jul 2017 23:17:57 -0400
 Subject: [PATCH] Fix Anvil Level sync to client
@@ -26,10 +26,10 @@ index 04f117ace..e3897a3f7 100644
  
          this.lastLevelCost = this.levelCost;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 28e00da32..f42bd0ced 100644
+index 005c8a00b..c9a707e7e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1252,6 +1252,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1282,6 +1282,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          if (container.getBukkitView().getType() != prop.getType()) {
              return false;
          }
@@ -42,5 +42,5 @@ index 28e00da32..f42bd0ced 100644
          return true;
      }
 -- 
-2.13.0
+2.13.3.windows.1
 

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit f078eed54b23d480eacb0b6f50b1468d5c8c81c5
+Subproject commit 4670a84bd9db26b4fd013f723f2089ae570ec9ae