Update upstream B/CB

7 files changed, 62 insertions, 84 deletions

diff --git a/Spigot-Server-Patches/0006-Timings-v2.patch b/Spigot-Server-Patches/0006-Timings-v2.patch
index ad46b0a813..65b698cefe 100644
--- a/Spigot-Server-Patches/0006-Timings-v2.patch
+++ b/Spigot-Server-Patches/0006-Timings-v2.patch
@@ -1,11 +1,11 @@
-From a8de9ff10ac7a01bd720b40a773b1ac7f53a5b41 Mon Sep 17 00:00:00 2001
+From 7d15c7cd26f998e90cb1854d92547f803d07a40b Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
 
 
 diff --git a/pom.xml b/pom.xml
-index 8b96966d8..8d1e8680b 100644
+index 8b96966d..8d1e8680 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -66,6 +66,12 @@
@@ -23,7 +23,7 @@ index 8b96966d8..8d1e8680b 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 000000000..4b4b77a5c
+index 00000000..4b4b77a5
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
 @@ -0,0 +1,124 @@
@@ -153,7 +153,7 @@ index 000000000..4b4b77a5c
 +}
 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 000000000..b79f1be7a
+index 00000000..b79f1be7
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimedChunkGenerator.java
 @@ -0,0 +1,126 @@
@@ -285,7 +285,7 @@ index 000000000..b79f1be7a
 +}
 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 000000000..e7789117b
+index 00000000..e7789117
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 @@ -0,0 +1,101 @@
@@ -391,7 +391,7 @@ index 000000000..e7789117b
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 75d4048a9..1ea799d59 100644
+index 75d4048a..1ea799d5 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 75d4048a9..1ea799d59 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index e8511ac9a..d3f1a4ac0 100644
+index e8511ac9..d3f1a4ac 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 e8511ac9a..d3f1a4ac0 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 81fc04ed3..bd3b16025 100644
+index 81fc04ed..bd3b1602 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 81fc04ed3..bd3b16025 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 daf2c0a67..3ba489d4f 100644
+index daf2c0a6..3ba489d4 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 daf2c0a67..3ba489d4f 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 a97e7d3c2..4890023d7 100644
+index a97e7d3c..4890023d 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 a97e7d3c2..4890023d7 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 cb83e4f56..e6819139f 100644
+index cb83e4f5..e6819139 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 cb83e4f56..e6819139f 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 9bd9dc28b..14d23556f 100644
+index 9bd9dc28..14d23556 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 9bd9dc28b..14d23556f 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 e9002c953..b22f81b12 100644
+index e9002c95..b22f81b1 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 e9002c953..b22f81b12 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
-index 347a2b671..aceb08ce1 100644
+index 347a2b67..aceb08ce 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 347a2b671..aceb08ce1 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index cc0efa2e0..1b432f0d7 100644
+index cc0efa2e..1b432f0d 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 cc0efa2e0..1b432f0d7 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 703d5813d..021dfba14 100644
+index 703d5813..021dfba1 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 703d5813d..021dfba14 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 9897bade8..27283efad 100644
+index 9897bade..27283efa 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;
@@ -1048,7 +1048,7 @@ index 9897bade8..27283efad 100644
          // CraftBukkit end
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
-index f74b06794..1fc632e0c 100644
+index f74b0679..1fc632e0 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 f74b06794..1fc632e0c 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index c0af82b48..676cc3f3e 100644
+index be52f3ad..d778eafb 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1,5 +1,6 @@
@@ -1088,7 +1088,7 @@ index c0af82b48..676cc3f3e 100644
  import com.google.common.collect.Lists;
  import com.google.common.collect.Maps;
  import com.google.common.collect.Sets;
-@@ -1172,10 +1173,11 @@ public abstract class PlayerList {
+@@ -1173,10 +1174,11 @@ public abstract class PlayerList {
      }
  
      public void savePlayers() {
@@ -1102,7 +1102,7 @@ index c0af82b48..676cc3f3e 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 f1f206501..fb350c408 100644
+index f1f20650..fb350c40 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 f1f206501..fb350c408 100644
          return flag;
      }
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 6958a2e0f..b3d3df4cf 100644
+index 6958a2e0..b3d3df4c 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 6958a2e0f..b3d3df4cf 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 758962e67..a87b37277 100644
+index 758962e6..a87b3727 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 758962e67..a87b37277 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 391a09c52..966938997 100644
+index 391a09c5..96693899 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 391a09c52..966938997 100644
  
      // CraftBukkit start
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 587d23dfd..d27e2ce98 100644
+index 587d23df..d27e2ce9 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 587d23dfd..d27e2ce98 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 41d2d87ee..000000000
+index 41d2d87e..00000000
 --- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 +++ /dev/null
 @@ -1,173 +0,0 @@
@@ -1619,7 +1619,7 @@ index 41d2d87ee..000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
-index 3a95b4465..b5efb9c3f 100644
+index 3a95b446..b5efb9c3 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 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 5ceb086e5..b56ae7a36 100644
+index 5ceb086e..b56ae7a3 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 5ceb086e5..b56ae7a36 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 92d217bce..9952b64be 100644
+index 92d217bc..9952b64b 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 92d217bce..9952b64be 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 220e39abe..afc6c17e6 100644
+index 220e39ab..afc6c17e 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 220e39abe..afc6c17e6 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 e52ef47b7..3d90b3426 100644
+index e52ef47b..3d90b342 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 e52ef47b7..3d90b3426 100644
          this.value = value;
      }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index c32d44df0..5c2fb0058 100644
+index c32d44df..5c2fb005 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 c32d44df0..5c2fb0058 100644
      }
  }
 -- 
-2.12.2.windows.2
+2.12.2
 
diff --git a/Spigot-Server-Patches/0115-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0115-Configurable-Player-Collision.patch
index adc6be6f4d..9e522e5961 100644
--- a/Spigot-Server-Patches/0115-Configurable-Player-Collision.patch
+++ b/Spigot-Server-Patches/0115-Configurable-Player-Collision.patch
@@ -1,11 +1,11 @@
-From fd4bdb80419297c9ba4b02f9f1f6aabe04e0665f Mon Sep 17 00:00:00 2001
+From f6310cc6c324b8888a8ada2c71896f32c796fa36 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 13 Apr 2016 02:10:49 -0400
 Subject: [PATCH] Configurable Player Collision
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 6b694705b..ee884ba57 100644
+index 6b694705..ee884ba5 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -224,4 +224,9 @@ public class PaperConfig {
@@ -19,7 +19,7 @@ index 6b694705b..ee884ba57 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/CommandScoreboard.java b/src/main/java/net/minecraft/server/CommandScoreboard.java
-index ab9aa132a..f9f59e559 100644
+index ab9aa132..f9f59e55 100644
 --- a/src/main/java/net/minecraft/server/CommandScoreboard.java
 +++ b/src/main/java/net/minecraft/server/CommandScoreboard.java
 @@ -183,6 +183,13 @@ public class CommandScoreboard extends CommandAbstract {
@@ -37,7 +37,7 @@ index ab9aa132a..f9f59e559 100644
                      }
                  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 33d23f4b2..988439a0a 100644
+index 3aea41f7..430168d2 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -331,6 +331,20 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -62,7 +62,7 @@ index 33d23f4b2..988439a0a 100644
  
      protected void l() {
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java b/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java
-index d8ec50455..eb45d3cf2 100644
+index d8ec5045..eb45d3cf 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java
 @@ -96,7 +96,7 @@ public class PacketPlayOutScoreboardTeam implements Packet<PacketListenerPlayOut
@@ -75,7 +75,7 @@ index d8ec50455..eb45d3cf2 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index a55a6fca0..be67df061 100644
+index b8d48b45..50a3dfe4 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -71,6 +71,7 @@ public abstract class PlayerList {
@@ -116,7 +116,7 @@ index a55a6fca0..be67df061 100644
          this.savePlayerFile(entityplayer);
          if (entityplayer.isPassenger()) {
              Entity entity = entityplayer.getVehicle();
-@@ -1312,7 +1329,13 @@ public abstract class PlayerList {
+@@ -1313,7 +1330,13 @@ public abstract class PlayerList {
              player.playerConnection.disconnect(this.server.server.getShutdownMessage()); // CraftBukkit - add custom shutdown message
          }
          // CraftBukkit end
@@ -132,5 +132,5 @@ index a55a6fca0..be67df061 100644
  
      // CraftBukkit start
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0159-Auto-Save-Improvements.patch b/Spigot-Server-Patches/0159-Auto-Save-Improvements.patch
index 8ee0cad59d..deb536cd33 100644
--- a/Spigot-Server-Patches/0159-Auto-Save-Improvements.patch
+++ b/Spigot-Server-Patches/0159-Auto-Save-Improvements.patch
@@ -1,4 +1,4 @@
-From 7c3a25fe8d6cc4957b83df04789ebe3265f2dc7f Mon Sep 17 00:00:00 2001
+From 6a963250c50acbdd345eecbbfe9445080716c906 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 19 Sep 2016 23:16:39 -0400
 Subject: [PATCH] Auto Save Improvements
@@ -12,7 +12,7 @@ Re-introduce a cap per tick for auto save (Spigot disabled the vanilla cap) and
 Adds incremental player auto saving too
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 468095a44..ae69751c3 100644
+index 468095a4..ae69751c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -255,4 +255,9 @@ public class PaperConfig {
@@ -26,7 +26,7 @@ index 468095a44..ae69751c3 100644
 +    }
  }
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index dc96bd7f4..bcf24cb49 100644
+index dc96bd7f..bcf24cb4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -2,6 +2,7 @@ package com.destroystokyo.paper;
@@ -58,7 +58,7 @@ index dc96bd7f4..bcf24cb49 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 88437d77a..9f7f32dc2 100644
+index 88437d77..9f7f32dc 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -960,11 +960,9 @@ public class Chunk {
@@ -76,7 +76,7 @@ index 88437d77a..9f7f32dc2 100644
  
      public Random a(long i) {
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 0a8e09e5e..ad668be62 100644
+index 0a8e09e5..ad668be6 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -1,5 +1,6 @@
@@ -96,7 +96,7 @@ index 0a8e09e5e..ad668be62 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index acda1843d..171ed25c3 100644
+index acda1843..171ed25c 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -32,6 +32,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -108,7 +108,7 @@ index acda1843d..171ed25c3 100644
      public final MinecraftServer server;
      public final PlayerInteractManager playerInteractManager;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f83cc7641..d49a4ded0 100644
+index 2349c3ad..8134501c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -118,6 +118,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -155,7 +155,7 @@ index f83cc7641..d49a4ded0 100644
          this.methodProfiler.a("tallying");
          // Spigot start
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index be67df061..f675a7013 100644
+index 50a3dfe4..185b5929 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -330,6 +330,7 @@ public abstract class PlayerList {
@@ -166,7 +166,7 @@ index be67df061..f675a7013 100644
          this.playerFileData.save(entityplayer);
          ServerStatisticManager serverstatisticmanager = (ServerStatisticManager) this.o.get(entityplayer.getUniqueID());
  
-@@ -1205,13 +1206,23 @@ public abstract class PlayerList {
+@@ -1206,13 +1207,23 @@ public abstract class PlayerList {
  
      }
  
@@ -192,7 +192,7 @@ index be67df061..f675a7013 100644
      public void addWhitelist(GameProfile gameprofile) {
          this.whitelist.add(new WhiteListEntry(gameprofile));
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index f969d2a72..cc0e8d2c8 100644
+index f969d2a7..cc0e8d2c 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1003,8 +1003,9 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -215,5 +215,5 @@ index f969d2a72..cc0e8d2c8 100644
              timings.worldSaveChunks.startTiming(); // Paper
              chunkproviderserver.a(flag);
 -- 
-2.12.1.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0201-Enforce-Sync-Player-Saves.patch b/Spigot-Server-Patches/0201-Enforce-Sync-Player-Saves.patch
index 10ad859914..c2bdc959f2 100644
--- a/Spigot-Server-Patches/0201-Enforce-Sync-Player-Saves.patch
+++ b/Spigot-Server-Patches/0201-Enforce-Sync-Player-Saves.patch
@@ -1,4 +1,4 @@
-From 23c858c8193322d1d433882ddc166349719842b1 Mon Sep 17 00:00:00 2001
+From 56afad7e112cc00b51a19785cf90268c748861fa Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 7 Jan 2017 15:41:58 -0500
 Subject: [PATCH] Enforce Sync Player Saves
@@ -7,10 +7,10 @@ Saving players async is extremely dangerous. This will force it to main
 the same way we handle async chunk loads.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index f675a7013..a9d59bbf5 100644
+index 185b5929..91a45a75 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -1212,6 +1212,7 @@ public abstract class PlayerList {
+@@ -1213,6 +1213,7 @@ public abstract class PlayerList {
      }
  
      public void savePlayers(Integer interval) {
@@ -18,7 +18,7 @@ index f675a7013..a9d59bbf5 100644
          long now = MinecraftServer.currentTick;
          MinecraftTimings.savePlayers.startTiming(); // Paper
          for (int i = 0; i < this.players.size(); ++i) {
-@@ -1221,6 +1222,7 @@ public abstract class PlayerList {
+@@ -1222,6 +1223,7 @@ public abstract class PlayerList {
              }
          }
          MinecraftTimings.savePlayers.stopTiming(); // Paper
@@ -27,5 +27,5 @@ index f675a7013..a9d59bbf5 100644
      // Paper end
  
 -- 
-2.12.0.windows.1
+2.12.2
 
diff --git a/Spigot-Server-Patches/0215-call-stopRiding-on-players-death.patch b/Spigot-Server-Patches/0215-call-stopRiding-on-players-death.patch
deleted file mode 100644
index 96c6aba7d8..0000000000
--- a/Spigot-Server-Patches/0215-call-stopRiding-on-players-death.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From fb9a4072a4c5fd2d0e109e626e49e348463d0ef7 Mon Sep 17 00:00:00 2001
-From: Shane Freeder <[email protected]>
-Date: Tue, 18 Apr 2017 15:01:43 +0100
-Subject: [PATCH] call stopRiding on players death.
-
-When a death occurs, any entity that the player is riding has the potential to be duplicated, as well as affecting the position of the entities position after respawning
-
-diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index a5c5bd4be..ad3218108 100644
---- a/src/main/java/net/minecraft/server/EntityPlayer.java
-+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -495,6 +495,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
-             entityliving.b(this, this.bb);
-         }
- 
-+        this.stopRiding(); // Paper - stop riding entities on death, preventing the entity from adjusting our location or duping the ridden entity
-         this.b(StatisticList.A);
-         this.a(StatisticList.h);
-         this.extinguish();
--- 
-2.12.2
-
diff --git a/work/Bukkit b/work/Bukkit
-Subproject 817fefd8466bf993e6629e686a72c94c51fedf9
+Subproject bbfe2ba6aa89f6299d2efe793b1956e8fc96b2c
diff --git a/work/CraftBukkit b/work/CraftBukkit
-Subproject 0ab698655ba6e50754affb059af46ee3cd57f49
+Subproject 7b044defc0a7ab4dbf5fe22cdf3d885ce5de757