Update upstream B/CB

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

@@ -1,11 +1,11 @@
-From 57a6b73c98e68ef1d2a215fb2ac38056aec5f8e5 Mon Sep 17 00:00:00 2001
+From a8de9ff10ac7a01bd720b40a773b1ac7f53a5b41 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
 
 
 diff --git a/pom.xml b/pom.xml
-index 8b96966d..8d1e8680 100644
+index 8b96966d8..8d1e8680b 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -66,6 +66,12 @@
@@ -23,7 +23,7 @@ index 8b96966d..8d1e8680 100644
              <version>3.0.3</version>
 diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
 new file mode 100644
-index 00000000..4b4b77a5
+index 000000000..4b4b77a5c
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
 @@ -0,0 +1,124 @@
@@ -153,7 +153,7 @@ index 00000000..4b4b77a5
 +}
 diff --git a/src/main/java/co/aikar/timings/TimedChunkGenerator.java b/src/main/java/co/aikar/timings/TimedChunkGenerator.java
 new file mode 100644
-index 00000000..b79f1be7
+index 000000000..b79f1be7a
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimedChunkGenerator.java
 @@ -0,0 +1,126 @@
@@ -285,7 +285,7 @@ index 00000000..b79f1be7
 +}
 diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 new file mode 100644
-index 00000000..e7789117
+index 000000000..e7789117b
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 @@ -0,0 +1,101 @@
@@ -391,7 +391,7 @@ index 00000000..e7789117
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 75d4048a..1ea799d5 100644
+index 75d4048a9..1ea799d59 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -14,11 +14,14 @@ import java.util.concurrent.TimeUnit;
@@ -435,7 +435,7 @@ index 75d4048a..1ea799d5 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index e8511ac9..d3f1a4ac 100644
+index e8511ac9a..d3f1a4ac0 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -35,6 +35,15 @@ public class Block {
@@ -455,7 +455,7 @@ index e8511ac9..d3f1a4ac 100644
      public static int getId(Block block) {
          return Block.REGISTRY.a(block); // CraftBukkit - decompile error
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 81fc04ed..bd3b1602 100644
+index 81fc04ed3..bd3b16025 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -900,7 +900,7 @@ public class Chunk {
@@ -503,7 +503,7 @@ index 81fc04ed..bd3b1602 100644
  
      private void z() {
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index daf2c0a6..3ba489d4 100644
+index daf2c0a67..3ba489d4f 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -195,7 +195,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -525,7 +525,7 @@ index daf2c0a6..3ba489d4 100644
              this.chunkLoader.a(this.world, chunk);
          } catch (IOException ioexception) {
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index a97e7d3c..4890023d 100644
+index a97e7d3c2..4890023d7 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -402,7 +402,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -565,7 +565,7 @@ index a97e7d3c..4890023d 100644
          // return chunk; // CraftBukkit
      }
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index cb83e4f5..e6819139 100644
+index cb83e4f56..e6819139f 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -23,7 +23,7 @@ import java.io.PrintStream;
@@ -618,7 +618,7 @@ index cb83e4f5..e6819139 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 9bd9dc28..14d23556 100644
+index 9bd9dc28b..14d23556f 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;
@@ -657,7 +657,7 @@ index 9bd9dc28..14d23556 100644
  
      public void recalcPosition() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index e9002c95..b22f81b1 100644
+index e9002c953..b22f81b12 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -31,7 +31,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -728,7 +728,7 @@ index e9002c95..b22f81b1 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
-index 347a2b67..aceb08ce 100644
+index 347a2b671..aceb08ce1 100644
 --- a/src/main/java/net/minecraft/server/EntityTracker.java
 +++ b/src/main/java/net/minecraft/server/EntityTracker.java
 @@ -175,7 +175,7 @@ public class EntityTracker {
@@ -759,7 +759,7 @@ index 347a2b67..aceb08ce 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index cc0efa2e..1b432f0d 100644
+index cc0efa2e0..1b432f0d7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -47,8 +47,8 @@ import org.bukkit.Bukkit;
@@ -900,7 +900,7 @@ index cc0efa2e..1b432f0d 100644
          this.methodProfiler.b();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 703d5813..021dfba1 100644
+index 703d5813d..021dfba14 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -1,5 +1,6 @@
@@ -1000,7 +1000,7 @@ index 703d5813..021dfba1 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 86f9776e..e19513a9 100644
+index 9897bade8..27283efad 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;
@@ -1011,7 +1011,7 @@ index 86f9776e..e19513a9 100644
  // CraftBukkit end
  
  public class PlayerConnection implements PacketListenerPlayIn, ITickable {
-@@ -1334,7 +1335,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1335,7 +1336,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
      // CraftBukkit end
  
     private void handleCommand(String s) {
@@ -1020,7 +1020,7 @@ index 86f9776e..e19513a9 100644
         // CraftBukkit start - whole method
          if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
          this.LOGGER.info(this.player.getName() + " issued server command: " + s);
-@@ -1345,22 +1346,22 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1346,22 +1347,22 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          this.server.getPluginManager().callEvent(event);
  
          if (event.isCancelled()) {
@@ -1048,7 +1048,7 @@ index 86f9776e..e19513a9 100644
          // CraftBukkit end
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
-index f74b0679..1fc632e0 100644
+index f74b06794..1fc632e0c 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
 @@ -1,15 +1,21 @@
@@ -1078,7 +1078,7 @@ index f74b0679..1fc632e0 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index c0af82b4..676cc3f3 100644
+index c0af82b48..676cc3f3e 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1,5 +1,6 @@
@@ -1102,7 +1102,7 @@ index c0af82b4..676cc3f3 100644
  
      public void addWhitelist(GameProfile gameprofile) {
 diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java
-index f1f20650..fb350c40 100644
+index f1f206501..fb350c408 100644
 --- a/src/main/java/net/minecraft/server/StructureGenerator.java
 +++ b/src/main/java/net/minecraft/server/StructureGenerator.java
 @@ -1,5 +1,7 @@
@@ -1144,7 +1144,7 @@ index f1f20650..fb350c40 100644
          return flag;
      }
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 6958a2e0..b3d3df4c 100644
+index 6958a2e0f..b3d3df4cf 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -4,12 +4,13 @@ import javax.annotation.Nullable;
@@ -1164,7 +1164,7 @@ index 6958a2e0..b3d3df4c 100644
      private static final RegistryMaterials<MinecraftKey, Class<? extends TileEntity>> f = new RegistryMaterials();
      protected World world;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 758962e6..a87b3727 100644
+index 758962e67..a87b37277 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -18,11 +18,11 @@ import com.google.common.collect.Maps;
@@ -1270,7 +1270,7 @@ index 758962e6..a87b3727 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 391a09c5..96693899 100644
+index 391a09c52..966938997 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -247,13 +247,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -1403,7 +1403,7 @@ index 391a09c5..96693899 100644
  
      // CraftBukkit start
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 587d23df..d27e2ce9 100644
+index 587d23dfd..d27e2ce98 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1741,6 +1741,7 @@ public final class CraftServer implements Server {
@@ -1441,7 +1441,7 @@ index 587d23df..d27e2ce9 100644
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 deleted file mode 100644
-index 41d2d87e..00000000
+index 41d2d87ee..000000000
 --- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 +++ /dev/null
 @@ -1,173 +0,0 @@
@@ -1619,7 +1619,7 @@ index 41d2d87e..00000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
-index 3a95b446..b5efb9c3 100644
+index 3a95b4465..b5efb9c3f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
 +++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
 @@ -1,6 +1,8 @@
@@ -1663,7 +1663,7 @@ index 3a95b446..b5efb9c3 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 5ceb086e..b56ae7a3 100644
+index 5ceb086e5..b56ae7a36 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -39,15 +39,9 @@ import org.bukkit.configuration.serialization.DelegateDeserialization;
@@ -1697,7 +1697,7 @@ index 5ceb086e..b56ae7a3 100644
  
      public Player.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 92d217bc..9952b64b 100644
+index 92d217bce..9952b64be 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -14,6 +14,7 @@ import java.util.concurrent.atomic.AtomicInteger;
@@ -1773,7 +1773,7 @@ index 92d217bc..9952b64b 100644
  
      private boolean isReady(final int currentTick) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
-index 220e39ab..afc6c17e 100644
+index 220e39abe..afc6c17e6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
 @@ -1,8 +1,8 @@
@@ -1855,7 +1855,7 @@ index 220e39ab..afc6c17e 100644
 -    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
-index e52ef47b..3d90b342 100644
+index e52ef47b7..3d90b3426 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
 @@ -5,6 +5,7 @@ import org.bukkit.util.CachedServerIcon;
@@ -1867,7 +1867,7 @@ index e52ef47b..3d90b342 100644
          this.value = value;
      }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index c32d44df..5c2fb005 100644
+index c32d44df0..5c2fb0058 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -29,7 +29,7 @@ import net.minecraft.server.EntityWither;
@@ -1929,5 +1929,5 @@ index c32d44df..5c2fb005 100644
      }
  }
 -- 
-2.12.2
+2.12.2.windows.2
 

Spigot-Server-Patches/0051-Ensure-commands-are-not-ran-async.patch

@@ -1,4 +1,4 @@
-From d94378d518cda98be6fc17c01200ed86b7ac3790 Mon Sep 17 00:00:00 2001
+From e66b45a8fc4d658d70b3faff1ab27165f4c7e879 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 01:17:12 -0600
 Subject: [PATCH] Ensure commands are not ran async
@@ -14,10 +14,10 @@ big slowdown in execution but throwing an exception at same time to raise awaren
 that it is happening so that plugin authors can fix their code to stop executing commands async.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index e19513a96..fd2c0c4f2 100644
+index 27283efad..57879c76d 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1267,6 +1267,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1268,6 +1268,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          }
  
          if (!async && s.startsWith("/")) {
@@ -48,7 +48,7 @@ index e19513a96..fd2c0c4f2 100644
          } else if (this.player.getChatFlags() == EntityHuman.EnumChatVisibility.SYSTEM) {
              // Do nothing, this is coming from a plugin
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 30ed3ad58..a795a165a 100644
+index 0f77d0674..5302bb283 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -647,6 +647,29 @@ public final class CraftServer implements Server {
@@ -82,5 +82,5 @@ index 30ed3ad58..a795a165a 100644
              return true;
          }
 -- 
-2.12.0.windows.1
+2.12.2.windows.2
 

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

@@ -1,14 +1,14 @@
-From c8f3da57d4793c642fc45ffb746e43eaa12a34a0 Mon Sep 17 00:00:00 2001
+From 44dab017dbfb0913ce29eb02f54337766b9c38d6 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 fd2c0c4f2..e0cc33924 100644
+index 57879c76d..b67837dd2 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1028,7 +1028,12 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1029,7 +1029,12 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
      // CraftBukkit start
      public void a(PacketPlayInResourcePackStatus packetplayinresourcepackstatus) {
          PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.x());
@@ -71,5 +71,5 @@ index d72ff0af2..5fd5e39fa 100644
      private final Player.Spigot spigot = new Player.Spigot()
      {
 -- 
-2.12.1.windows.1
+2.12.2.windows.2
 

Spigot-Server-Patches/0093-Access-items-by-EquipmentSlot.patch

@@ -1,14 +1,14 @@
-From 5e5214b56e304a9e26c3d5ce2c106e1fe3f2ac5b Mon Sep 17 00:00:00 2001
+From 8e14d9745e779264b36de11905925262ea2c1cb4 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 20 Mar 2016 06:45:01 -0400
 Subject: [PATCH] Access items by EquipmentSlot
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
-index d8c5364df..120ec897f 100644
+index 67c54899d..3f58c34e0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
-@@ -271,4 +271,54 @@ public class CraftInventoryPlayer extends CraftInventory implements org.bukkit.i
+@@ -267,4 +267,54 @@ public class CraftInventoryPlayer extends CraftInventory implements org.bukkit.i
      public void setBootsDropChance(float chance) {
          throw new UnsupportedOperationException();
      }
@@ -64,5 +64,5 @@ index d8c5364df..120ec897f 100644
 +    // Paper end
  }
 -- 
-2.12.0.windows.1
+2.12.2.windows.2
 

Spigot-Server-Patches/0104-Add-PlayerUseUnknownEntityEvent.patch

@@ -1,4 +1,4 @@
-From 2b5c2ffb68f66bcde5c41dea234c760d72bf4e31 Mon Sep 17 00:00:00 2001
+From ae218e1dc8c65c8e474da62a4799a0b42a7ec276 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 2 Apr 2016 05:09:16 -0400
 Subject: [PATCH] Add PlayerUseUnknownEntityEvent
@@ -18,10 +18,10 @@ index c67cb54a3..521f46262 100644
      private Vec3D c;
      private EnumHand d;
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index e0cc33924..c5fd65d27 100644
+index b67837dd2..840448995 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1613,6 +1613,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1614,6 +1614,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                  }
              }
          }
@@ -39,5 +39,5 @@ index e0cc33924..c5fd65d27 100644
      }
  
 -- 
-2.12.0.windows.1
+2.12.2.windows.2
 

Spigot-Server-Patches/0111-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch

@@ -1,4 +1,4 @@
-From 43163c071565eedd53eb2ab74fb0bb58c52d2485 Mon Sep 17 00:00:00 2001
+From e5561846f3f37b66f1140ab87113b267f45f7c5b Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 6 Apr 2016 01:04:23 -0500
 Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names
@@ -31,10 +31,10 @@ index 70a431a63..8908d8b8d 100644
      public ScoreboardTeamBase aQ() {
          if (!this.world.paperConfig.nonPlayerEntitiesOnScoreboards && !(this instanceof EntityHuman)) { return null; } // Paper
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index c5fd65d27..6dfeb9be9 100644
+index 840448995..dfbae01f4 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1346,7 +1346,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1347,7 +1347,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                      return;
                  }
  
@@ -51,5 +51,5 @@ index c5fd65d27..6dfeb9be9 100644
                  if (((LazyPlayerSet) event.getRecipients()).isLazy()) {
                      for (Object recipient : minecraftServer.getPlayerList().players) {
 -- 
-2.12.0.windows.1
+2.12.2.windows.2
 

Spigot-Server-Patches/0151-More-informative-vehicle-moved-wrongly-message.patch

@@ -1,14 +1,14 @@
-From 6716df1f949c2de8b747ab4e1ffd8e88d2f0cb84 Mon Sep 17 00:00:00 2001
+From aaab3d867b510ec66c2dfdf7e418593c5f7d94a2 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 28 Jul 2016 17:58:53 -0500
 Subject: [PATCH] More informative vehicle moved wrongly message
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 6dfeb9be9..e01787021 100644
+index dfbae01f4..4b79031f0 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -342,7 +342,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -343,7 +343,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
  
                  if (d10 > org.spigotmc.SpigotConfig.movedWronglyThreshold) { // Spigot
                      flag1 = true;
@@ -18,5 +18,5 @@ index 6dfeb9be9..e01787021 100644
  
                  entity.setLocation(d3, d4, d5, f, f1);
 -- 
-2.12.0.windows.1
+2.12.2.windows.2
 

Spigot-Server-Patches/0156-Fix-AIOOBE-in-inventory-handling.patch

@@ -1,14 +1,14 @@
-From 47ce11bab2409db675956daff0232adab29d0080 Mon Sep 17 00:00:00 2001
+From e20323c602961501ee58642a9caa3b4813a70899 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Sun, 4 Sep 2016 16:35:43 -0500
 Subject: [PATCH] Fix AIOOBE in inventory handling
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index e01787021..a99ec1f10 100644
+index 4b79031f0..060434f32 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1808,7 +1808,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1809,7 +1809,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                      case CLONE:
                          if (packetplayinwindowclick.c() == 2) {
                              click = ClickType.MIDDLE;
@@ -18,5 +18,5 @@ index e01787021..a99ec1f10 100644
                              } else {
                                  Slot slot = this.player.activeContainer.getSlot(packetplayinwindowclick.b());
 -- 
-2.12.0.windows.1
+2.12.2.windows.2
 

Spigot-Server-Patches/0157-Configurable-packet-in-spam-threshold.patch

@@ -1,4 +1,4 @@
-From ff09c2d454cf4139e2f7851b893867c43cbe2cfa Mon Sep 17 00:00:00 2001
+From 75d4c57a672aeb08a882dd8335152afdaa3a5eaf Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 11 Sep 2016 14:30:57 -0500
 Subject: [PATCH] Configurable packet in spam threshold
@@ -23,10 +23,10 @@ index d1d50f0db..2f17b9013 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index a99ec1f10..ef88d568b 100644
+index 060434f32..6281fe4d5 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -870,13 +870,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -871,13 +871,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
      // Spigot start - limit place/interactions
      private int limitedPackets;
      private long lastLimitedPacket = -1;
@@ -44,5 +44,5 @@ index a99ec1f10..ef88d568b 100644
              limitedPackets = 0;
              return true;
 -- 
-2.12.0.windows.1
+2.12.2.windows.2
 

Spigot-Server-Patches/0158-Configurable-flying-kick-messages.patch

@@ -1,4 +1,4 @@
-From 8558acf638ad270e7c80e9125a33db09b00c9389 Mon Sep 17 00:00:00 2001
+From c2e7d9be5b070dc9d1c43795ef78468d090c222c Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Tue, 20 Sep 2016 00:58:01 +0000
 Subject: [PATCH] Configurable flying kick messages
@@ -21,10 +21,10 @@ index 2f17b9013..468095a44 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index ef88d568b..b7e1d84d4 100644
+index 6281fe4d5..51d27351d 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -142,7 +142,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -143,7 +143,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          if (this.B) {
              if (++this.C > 80) {
                  PlayerConnection.LOGGER.warn("{} was kicked for floating too long!", new Object[] { this.player.getName()});
@@ -33,7 +33,7 @@ index ef88d568b..b7e1d84d4 100644
                  return;
              }
          } else {
-@@ -161,7 +161,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -162,7 +162,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
              if (this.D && this.player.getVehicle().bw() == this.player) {
                  if (++this.E > 80) {
                      PlayerConnection.LOGGER.warn("{} was kicked for floating a vehicle too long!", new Object[] { this.player.getName()});
@@ -43,5 +43,5 @@ index ef88d568b..b7e1d84d4 100644
                  }
              } else {
 -- 
-2.12.0.windows.1
+2.12.2.windows.2
 

Spigot-Server-Patches/0190-IllegalPacketEvent.patch

@@ -1,4 +1,4 @@
-From 80e120a3ad4e27aa1ae8e4ee664b4bf1f7349ebb Mon Sep 17 00:00:00 2001
+From 8d415cbbc51eca2c8d6e90646606cca8326d13ec 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 b7e1d84d4..9214c5594 100644
+index 51d27351d..437575003 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 b7e1d84d4..9214c5594 100644
  import co.aikar.timings.MinecraftTimings; // Paper
  // CraftBukkit end
  
-@@ -2228,8 +2229,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2236,8 +2237,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                      CraftEventFactory.handleEditBookEvent(player, itemstack1); // CraftBukkit
                  }
              } catch (Exception exception) {
@@ -27,7 +27,7 @@ index b7e1d84d4..9214c5594 100644
              }
          } else {
              String s1;
-@@ -2271,8 +2271,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2286,8 +2286,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                          CraftEventFactory.handleEditBookEvent(player, itemstack2); // CraftBukkit
                      }
                  } catch (Exception exception1) {
@@ -37,7 +37,7 @@ index b7e1d84d4..9214c5594 100644
                  }
              } else if ("MC|TrSel".equals(s)) {
                  try {
-@@ -2283,8 +2282,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2298,8 +2297,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                          ((ContainerMerchant) container).d(j);
                      }
                  } catch (Exception exception2) {
@@ -47,7 +47,7 @@ index b7e1d84d4..9214c5594 100644
                  }
              } else {
                  TileEntity tileentity;
-@@ -2425,8 +2423,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2440,8 +2438,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                                      iinventory.update();
                                  }
                              } catch (Exception exception5) {
@@ -57,7 +57,7 @@ index b7e1d84d4..9214c5594 100644
                              }
                          }
                      } else if ("MC|ItemName".equals(s)) {
-@@ -2525,7 +2522,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2540,7 +2537,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) {
@@ -67,5 +67,5 @@ index b7e1d84d4..9214c5594 100644
                      }
                      // CraftBukkit start
 -- 
-2.12.0.windows.1
+2.12.2.windows.2
 

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

@@ -1,4 +1,4 @@
-From 2f3f6a481abc5023e04d0bb3225182beda67ae73 Mon Sep 17 00:00:00 2001
+From 7f420a068ba59888256fc5a56073b27c1c0d5878 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 56ce2554d..a5c5bd4be 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 9214c5594..964de593b 100644
+index 437575003..7c2d43ac2 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2550,6 +2550,6 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2565,6 +2565,6 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
  
      // CraftBukkit start - Add "isDisconnected" method
      public final boolean isDisconnected() {
@@ -31,5 +31,5 @@ index 9214c5594..964de593b 100644
      }
  }
 -- 
-2.12.1.windows.1
+2.12.2.windows.2
 

Spigot-Server-Patches/0197-MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch

@@ -1,4 +1,4 @@
-From 79e01e8729076dc628257287f9f4856ddd913c1c Mon Sep 17 00:00:00 2001
+From 06bdb38dccc19befbe7f7545c8f9000f4a84f5d2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 2 Jan 2017 02:07:24 -0500
 Subject: [PATCH] MC-111699: Ignore Improper Anvil Item Name Packets
@@ -11,10 +11,10 @@ This breaks the ability to rename more than 1 item at a time.
 See: https://bugs.mojang.com/browse/MC-111699
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 964de593b..87683b20b 100644
+index 7c2d43ac2..cbe5d36d0 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2434,7 +2434,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2449,7 +2449,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                                  String s4 = SharedConstants.a(packetplayincustompayload.b().e(32767));
  
                                  if (s4.length() <= 30) {
@@ -24,5 +24,5 @@ index 964de593b..87683b20b 100644
                              } else {
                                  containeranvil.a("");
 -- 
-2.12.0.windows.1
+2.12.2.windows.2
 

Spigot-Server-Patches/0198-MC-112017-Allow-31-instead-of-30-for-item-names.patch

@@ -1,14 +1,14 @@
-From fbb958e3fbfa9a3023d622749195be5c5bae9179 Mon Sep 17 00:00:00 2001
+From 5e65f26bff62e97dbf079f330ef3d8746928273c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 2 Jan 2017 02:43:22 -0500
 Subject: [PATCH] MC-112017: Allow 31 instead of 30 for item names
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 87683b20b..e69817d84 100644
+index cbe5d36d0..70af4ebbb 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2433,7 +2433,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2448,7 +2448,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                              if (packetplayincustompayload.b() != null && packetplayincustompayload.b().readableBytes() >= 1) {
                                  String s4 = SharedConstants.a(packetplayincustompayload.b().e(32767));
  
@@ -18,5 +18,5 @@ index 87683b20b..e69817d84 100644
                                  }
                              } else {
 -- 
-2.12.0.windows.1
+2.12.2.windows.2
 

Spigot-Server-Patches/0204-Fix-block-break-desync.patch

@@ -1,14 +1,14 @@
-From 7f39a34c6406bad1fe92f339c500f21952c23bd9 Mon Sep 17 00:00:00 2001
+From 3df0dc4ae609d6cce1381f9142ab279f6e5d404a Mon Sep 17 00:00:00 2001
 From: Michael Himing <mhiming@gmail.com>
 Date: Sun, 8 Jan 2017 18:50:35 +1100
 Subject: [PATCH] Fix block break desync
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index e69817d84..10c53965c 100644
+index 70af4ebbb..0e2f43b96 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -829,6 +829,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -830,6 +830,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
              double d3 = d0 * d0 + d1 * d1 + d2 * d2;
  
              if (d3 > 36.0D) {
@@ -17,5 +17,5 @@ index e69817d84..10c53965c 100644
              } else if (blockposition.getY() >= this.minecraftServer.getMaxBuildHeight()) {
                  return;
 -- 
-2.12.0.windows.1
+2.12.2.windows.2
 

work/Bukkit

@@ -1 +1 @@
-Subproject commit 6751fefdda0b171e0830d31e701d4be66af73c9d
+Subproject commit 817fefd8466bf993e6629e686a72c94c51fedf90

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit e17c3d285b1026811acc1df8a1299d4ad7a6953a
+Subproject commit 1c3428e534283395dd1b85641a96a6f16842fc1e