Properly update patches for upstream merge

67 files changed, 298 insertions, 235 deletions

diff --git a/Spigot-Server-Patches/0005-Timings-v2.patch b/Spigot-Server-Patches/0005-Timings-v2.patch
index 2cdfc8297c..aa0968db8f 100644
--- a/Spigot-Server-Patches/0005-Timings-v2.patch
+++ b/Spigot-Server-Patches/0005-Timings-v2.patch
@@ -1,4 +1,4 @@
-From 42571345704ae6d7b8139b39bf4d90eeed7582bc Mon Sep 17 00:00:00 2001
+From 9b8b2dbd4c28d92465f6689dc33ffbe5465f8a80 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
@@ -23,7 +23,7 @@ index 4ae34c8..63aaa7a 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 0000000..2dff5e3
+index 0000000..29838de
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
 @@ -0,0 +1,114 @@
@@ -45,7 +45,7 @@ index 0000000..2dff5e3
 +    public static final Timing chunkIOTickTimer = Timings.ofSafe("ChunkIOTick");
 +    public static final Timing timeUpdateTimer = Timings.ofSafe("Time Update");
 +    public static final Timing serverCommandTimer = Timings.ofSafe("Server Command");
-+    public static final Timing worldSaveTimer = Timings.ofSafe("World Save");
++    public static final Timing savePlayers = Timings.ofSafe("Save Players");
 +
 +    public static final Timing tickEntityTimer = Timings.ofSafe("## tickEntity");
 +    public static final Timing tickTileEntityTimer = Timings.ofSafe("## tickTileEntity");
@@ -275,10 +275,10 @@ index 0000000..2bf5b66
 +}
 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 0000000..36aafb2
+index 0000000..e778911
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
-@@ -0,0 +1,91 @@
+@@ -0,0 +1,101 @@
 +package co.aikar.timings;
 +
 +import net.minecraft.server.World;
@@ -325,6 +325,11 @@ index 0000000..36aafb2
 +    public final Timing chunkGeneration;
 +    public final Timing chunkIOStage1;
 +    public final Timing chunkIOStage2;
++    public final Timing worldSave;
++    public final Timing worldSaveChunks;
++    public final Timing worldSaveLevel;
++    public final Timing chunkSaveNop;
++    public final Timing chunkSaveData;
 +
 +    public WorldTimingsHandler(World server) {
 +        String name = server.worldData.getName() +" - ";
@@ -363,6 +368,11 @@ index 0000000..36aafb2
 +        chunkGeneration = Timings.ofSafe(name + "chunkGeneration");
 +        chunkIOStage1 = Timings.ofSafe(name + "ChunkIO Stage 1 - DiskIO");
 +        chunkIOStage2 = Timings.ofSafe(name + "ChunkIO Stage 2 - Post Load");
++        worldSave = Timings.ofSafe(name + "World Save");
++        worldSaveLevel = Timings.ofSafe(name + "World Save - Level");
++        worldSaveChunks = Timings.ofSafe(name + "World Save - Chunks");
++        chunkSaveNop = Timings.ofSafe(name + "Chunk Save - NOP");
++        chunkSaveData = Timings.ofSafe(name + "Chunk Save - Data");
 +
 +        tracker1 = Timings.ofSafe(name + "tracker stage 1");
 +        tracker2 = Timings.ofSafe(name + "tracker stage 2");
@@ -482,6 +492,28 @@ index b651edc..5807bb8 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 5682f03..1380815 100644
+--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
++++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
+@@ -194,7 +194,7 @@ public class ChunkProviderServer implements IChunkProvider {
+     }
+ 
+     public void saveChunkNOP(Chunk chunk) {
+-        try {
++        try (co.aikar.timings.Timing timed = world.timings.chunkSaveNop.startTiming()) {
+             this.chunkLoader.b(this.world, chunk);
+         } catch (Exception exception) {
+             ChunkProviderServer.a.error("Couldn\'t save entities", exception);
+@@ -203,7 +203,7 @@ public class ChunkProviderServer implements IChunkProvider {
+     }
+ 
+     public void saveChunk(Chunk chunk) {
+-        try {
++        try (co.aikar.timings.Timing timed = world.timings.chunkSaveData.startTiming()) {
+             chunk.setLastSaved(this.world.getTime());
+             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 f604639..17dd7bb 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -695,7 +727,7 @@ index 5432e70..72cd51a 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 26f8467..891c7ea 100644
+index 26f8467..4814643 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -45,7 +45,7 @@ import org.bukkit.Bukkit;
@@ -724,25 +756,23 @@ index 26f8467..891c7ea 100644
          long i = System.nanoTime();
  
          ++this.ticks;
-@@ -681,7 +682,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -681,7 +682,6 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
          }
  
          if (autosavePeriod > 0 && this.ticks % autosavePeriod == 0) { // CraftBukkit
 -            SpigotTimings.worldSaveTimer.startTiming(); // Spigot
-+            MinecraftTimings.worldSaveTimer.startTiming(); // Spigot
              this.methodProfiler.a("save");
              this.v.savePlayers();
              // Spigot Start
-@@ -696,7 +697,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -696,7 +696,6 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
              // this.saveChunks(true);
              // Spigot End
              this.methodProfiler.b();
 -            SpigotTimings.worldSaveTimer.stopTiming(); // Spigot
-+            MinecraftTimings.worldSaveTimer.stopTiming(); // Spigot
          }
  
          this.methodProfiler.a("tallying");
-@@ -713,15 +714,16 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -713,15 +712,16 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
  
          this.methodProfiler.b();
          this.methodProfiler.b();
@@ -763,7 +793,7 @@ index 26f8467..891c7ea 100644
          this.methodProfiler.a("jobs");
          Queue queue = this.j;
  
-@@ -732,22 +734,23 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -732,22 +732,23 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
              SystemUtils.a(entry, MinecraftServer.LOGGER);
           }
          // Spigot end
@@ -792,7 +822,7 @@ index 26f8467..891c7ea 100644
          // Send time updates to everyone, it will get the right time from the world the player is in.
          if (this.ticks % 20 == 0) {
              for (int i = 0; i < this.getPlayerList().players.size(); ++i) {
-@@ -755,7 +758,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -755,7 +756,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
                  entityplayer.playerConnection.sendPacket(new PacketPlayOutUpdateTime(entityplayer.world.getTime(), entityplayer.getPlayerTime(), entityplayer.world.getGameRules().getBoolean("doDaylightCycle"))); // Add support for per player time
              }
          }
@@ -801,7 +831,7 @@ index 26f8467..891c7ea 100644
  
          int i;
  
-@@ -812,9 +815,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -812,9 +813,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
  
                  this.methodProfiler.b();
                  this.methodProfiler.a("tracker");
@@ -811,7 +841,7 @@ index 26f8467..891c7ea 100644
                  this.methodProfiler.b();
                  this.methodProfiler.b();
              // } // CraftBukkit
-@@ -823,20 +824,20 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -823,20 +822,20 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
          }
  
          this.methodProfiler.c("connection");
@@ -986,6 +1016,30 @@ index 8f42ac8..0546cb8 100644
          // this.minecraftServer.getCommandHandler().a(this.player, s);
          // CraftBukkit end
      }
+diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
+index 6bd7151..1b2cc01 100644
+--- a/src/main/java/net/minecraft/server/PlayerList.java
++++ b/src/main/java/net/minecraft/server/PlayerList.java
+@@ -1,5 +1,6 @@
+ package net.minecraft.server;
+ 
++import co.aikar.timings.MinecraftTimings;
+ import com.google.common.collect.Lists;
+ import com.google.common.collect.Maps;
+ import com.google.common.collect.Sets;
+@@ -1167,10 +1168,11 @@ public abstract class PlayerList {
+     }
+ 
+     public void savePlayers() {
++        MinecraftTimings.savePlayers.startTiming(); // Paper
+         for (int i = 0; i < this.players.size(); ++i) {
+             this.savePlayerFile((EntityPlayer) this.players.get(i));
+         }
+-
++        MinecraftTimings.savePlayers.stopTiming(); // Paper
+     }
+ 
+     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 8dd434c..c965af1 100644
 --- a/src/main/java/net/minecraft/server/StructureGenerator.java
@@ -1155,7 +1209,7 @@ index e649435..b73f64e 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 50fad7c..769d55b 100644
+index 50fad7c..3d98392 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -246,13 +246,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -1244,6 +1298,49 @@ index 50fad7c..769d55b 100644
          // CraftBukkit end
      }
  
+@@ -1007,6 +1015,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+ 
+         if (chunkproviderserver.e()) {
+             org.bukkit.Bukkit.getPluginManager().callEvent(new org.bukkit.event.world.WorldSaveEvent(getWorld())); // CraftBukkit
++            timings.worldSave.startTiming(); // Paper
+             if (iprogressupdate != null) {
+                 iprogressupdate.a("Saving level");
+             }
+@@ -1016,7 +1025,9 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+                 iprogressupdate.c("Saving chunks");
+             }
+ 
++            timings.worldSaveChunks.startTiming(); // Paper
+             chunkproviderserver.a(flag);
++            timings.worldSaveChunks.stopTiming(); // Paper
+             // CraftBukkit - ArrayList -> Collection
+             Collection arraylist = chunkproviderserver.a();
+             Iterator iterator = arraylist.iterator();
+@@ -1028,7 +1039,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+                     chunkproviderserver.unload(chunk);
+                 }
+             }
+-
++            timings.worldSave.stopTiming(); // Paper
+         }
+     }
+ 
+@@ -1041,6 +1052,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+     }
+ 
+     protected void a() throws ExceptionWorldConflict {
++        timings.worldSaveLevel.startTiming(); // Paper
+         this.checkSession();
+         WorldServer[] aworldserver = this.server.worldServer;
+         int i = aworldserver.length;
+@@ -1070,6 +1082,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+         this.worldData.e(this.getWorldBorder().i());
+         this.dataManager.saveWorldData(this.worldData, this.server.getPlayerList().t());
+         this.worldMaps.a();
++        timings.worldSaveLevel.stopTiming(); // Paper
+     }
+ 
+     // CraftBukkit start
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 index e7e9941..5f2a9b0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
diff --git a/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
index 58ca0a03c6..53251f6e58 100644
--- a/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
+++ b/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
@@ -1,4 +1,4 @@
-From 16d6873a483163cd2febc990d57bf533e7a92756 Mon Sep 17 00:00:00 2001
+From c7b09e1fe02118a64de6d2a35558912e0278aea1 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Tue, 1 Mar 2016 14:32:43 -0600
 Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang
@@ -20,10 +20,10 @@ index a8b5079..ebbc1fc 100644
              EULA.a.warn("Failed to save {}", new Object[] { this.b, exception});
          } finally {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 891c7ea..062cfd6 100644
+index 4814643..41f560f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1030,7 +1030,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -1028,7 +1028,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
      }
  
      public String getServerModName() {
diff --git a/Spigot-Server-Patches/0030-Lighting-Queue.patch b/Spigot-Server-Patches/0030-Lighting-Queue.patch
index 95e24cadad..4822dda513 100644
--- a/Spigot-Server-Patches/0030-Lighting-Queue.patch
+++ b/Spigot-Server-Patches/0030-Lighting-Queue.patch
@@ -1,4 +1,4 @@
-From 6ceeb5a95f2b04aa60c021c103bcb75a2e6568dc Mon Sep 17 00:00:00 2001
+From fa2e0c1e868ffb94b3748ffbd75b60a5b6ce38fc Mon Sep 17 00:00:00 2001
 From: Byteflux <[email protected]>
 Date: Wed, 2 Mar 2016 00:52:31 -0600
 Subject: [PATCH] Lighting Queue
@@ -6,19 +6,19 @@ Subject: [PATCH] Lighting Queue
 This provides option to queue lighting updates to ensure they do not cause the server lag
 
 diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
-index 36aafb2..90bdbf0 100644
+index e778911..f90f5bf 100644
 --- a/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
-@@ -45,6 +45,8 @@ public class WorldTimingsHandler {
-     public final Timing chunkIOStage1;
-     public final Timing chunkIOStage2;
+@@ -50,6 +50,8 @@ public class WorldTimingsHandler {
+     public final Timing chunkSaveNop;
+     public final Timing chunkSaveData;
  
 +    public final Timing lightingQueueTimer;
 +
      public WorldTimingsHandler(World server) {
          String name = server.worldData.getName() +" - ";
  
-@@ -87,5 +89,7 @@ public class WorldTimingsHandler {
+@@ -97,5 +99,7 @@ public class WorldTimingsHandler {
          tracker2 = Timings.ofSafe(name + "tracker stage 2");
          doTick = Timings.ofSafe(name + "doTick");
          tickEntities = Timings.ofSafe(name + "tickEntities");
@@ -85,7 +85,7 @@ index 445419f..76130c9 100644
  
                  TileEntity tileentity;
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 5682f03..5eeefe8 100644
+index 1380815..466cd49 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -279,6 +279,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -97,7 +97,7 @@ index 5682f03..5eeefe8 100644
          // Update neighbor counts
          for (int x = -2; x < 3; x++) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1363472..d0060d0 100644
+index 029a6c3..f0dcb9f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -709,7 +709,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -109,7 +109,7 @@ index 1363472..d0060d0 100644
  
          ++this.ticks;
          if (this.S) {
-@@ -769,6 +769,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -767,6 +767,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
          this.methodProfiler.b();
  
          org.spigotmc.WatchdogThread.tick(); // Spigot
@@ -235,5 +235,5 @@ index 8fb8176..672167a 100644
                  }
  
 -- 
-2.9.3
+2.10.1
 
diff --git a/Spigot-Server-Patches/0035-Optimize-explosions.patch b/Spigot-Server-Patches/0035-Optimize-explosions.patch
index e8aa1cedf2..845eda3d0f 100644
--- a/Spigot-Server-Patches/0035-Optimize-explosions.patch
+++ b/Spigot-Server-Patches/0035-Optimize-explosions.patch
@@ -1,4 +1,4 @@
-From f8839281ef56121c254147fe119f99a82f918977 Mon Sep 17 00:00:00 2001
+From 515eed54a3ee0c2bcc5e03d27f522fc6c650f7e8 Mon Sep 17 00:00:00 2001
 From: Byteflux <[email protected]>
 Date: Wed, 2 Mar 2016 11:59:48 -0600
 Subject: [PATCH] Optimize explosions
@@ -124,10 +124,10 @@ index f4765d3..caf29c7 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d0060d0..d1d268f 100644
+index f0dcb9f..885fc80 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -872,6 +872,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -870,6 +870,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
                  worldserver.getTracker().updatePlayers();
                  this.methodProfiler.b();
                  this.methodProfiler.b();
diff --git a/Spigot-Server-Patches/0052-Add-PlayerInitialSpawnEvent.patch b/Spigot-Server-Patches/0052-Add-PlayerInitialSpawnEvent.patch
index c380e4ebcc..f943f34fd6 100644
--- a/Spigot-Server-Patches/0052-Add-PlayerInitialSpawnEvent.patch
+++ b/Spigot-Server-Patches/0052-Add-PlayerInitialSpawnEvent.patch
@@ -1,4 +1,4 @@
-From 4ffa318aa9a2c11b22b34cfddcf85f87155b2ef9 Mon Sep 17 00:00:00 2001
+From dc4a0fc1d58a758366ee67244d3eafb9bced3f4c Mon Sep 17 00:00:00 2001
 From: Steve Anton <[email protected]>
 Date: Thu, 3 Mar 2016 00:09:38 -0600
 Subject: [PATCH] Add PlayerInitialSpawnEvent
@@ -6,10 +6,10 @@ Subject: [PATCH] Add PlayerInitialSpawnEvent
 For modifying a player's initial spawn location as they join the server
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 6bd7151..e88e918 100644
+index 1b2cc01..28bcef8 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -100,6 +100,21 @@ public abstract class PlayerList {
+@@ -101,6 +101,21 @@ public abstract class PlayerList {
          }
          // CraftBukkit end
  
diff --git a/Spigot-Server-Patches/0067-Add-exception-reporting-event.patch b/Spigot-Server-Patches/0067-Add-exception-reporting-event.patch
index 15625283ed..a0642bb1e7 100644
--- a/Spigot-Server-Patches/0067-Add-exception-reporting-event.patch
+++ b/Spigot-Server-Patches/0067-Add-exception-reporting-event.patch
@@ -1,4 +1,4 @@
-From 4b3de3279ff605f479f435c237f7f4188477116e Mon Sep 17 00:00:00 2001
+From 3b67a07162cd0af9af66a25721a5cbd5fdaa755b Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <[email protected]>
 Date: Thu, 3 Mar 2016 03:15:41 -0600
 Subject: [PATCH] Add exception reporting event
@@ -89,7 +89,7 @@ index 989d510..9118e4d 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 5eeefe8..299cc91 100644
+index 466cd49..cbc93a8 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -11,6 +11,7 @@ import java.util.Iterator;
@@ -114,7 +114,7 @@ index 5eeefe8..299cc91 100644
          }
      }
 @@ -197,7 +202,11 @@ public class ChunkProviderServer implements IChunkProvider {
-         try {
+         try (co.aikar.timings.Timing timed = world.timings.chunkSaveNop.startTiming()) {
              this.chunkLoader.b(this.world, chunk);
          } catch (Exception exception) {
 -            ChunkProviderServer.a.error("Couldn\'t save entities", exception);
diff --git a/Spigot-Server-Patches/0109-Add-getEntity-by-UUID-API.patch b/Spigot-Server-Patches/0109-Add-getEntity-by-UUID-API.patch
index fbbcd8d674..2a4cc5e9d9 100644
--- a/Spigot-Server-Patches/0109-Add-getEntity-by-UUID-API.patch
+++ b/Spigot-Server-Patches/0109-Add-getEntity-by-UUID-API.patch
@@ -1,14 +1,14 @@
-From e24ae8483920061ed713e82d14fe85453584e97d Mon Sep 17 00:00:00 2001
+From 6d145e5a2fd5ae436b9fd776e43a8ec7f840f557 Mon Sep 17 00:00:00 2001
 From: DemonWav <[email protected]>
 Date: Wed, 30 Mar 2016 01:20:11 -0500
 Subject: [PATCH] Add getEntity by UUID API
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d1d268f..35a8602 100644
+index 885fc80..7bb6033 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1508,6 +1508,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -1506,6 +1506,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
          this.Y = 0L;
      }
  
@@ -16,7 +16,7 @@ index d1d268f..35a8602 100644
      @Nullable
      public Entity a(UUID uuid) {
          WorldServer[] aworldserver = this.worldServer;
-@@ -1521,7 +1522,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -1519,7 +1520,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
              if (worldserver != null) {
                  Entity entity = worldserver.getEntity(uuid);
  
diff --git a/Spigot-Server-Patches/0113-Fix-reducedDebugInfo-not-initialized-on-client.patch b/Spigot-Server-Patches/0113-Fix-reducedDebugInfo-not-initialized-on-client.patch
index 44ece30137..0fc340deee 100644
--- a/Spigot-Server-Patches/0113-Fix-reducedDebugInfo-not-initialized-on-client.patch
+++ b/Spigot-Server-Patches/0113-Fix-reducedDebugInfo-not-initialized-on-client.patch
@@ -1,14 +1,14 @@
-From 20e687ed6f45f084359189c317b998a128ac1817 Mon Sep 17 00:00:00 2001
+From 633439d83c79873b6854921b4352bb2b1837f987 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <[email protected]>
 Date: Sat, 2 Apr 2016 20:37:03 -0400
 Subject: [PATCH] Fix reducedDebugInfo not initialized on client
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index e88e918..a41bc5f 100644
+index 28bcef8..d26da3a 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -152,6 +152,7 @@ public abstract class PlayerList {
+@@ -153,6 +153,7 @@ public abstract class PlayerList {
          playerconnection.sendPacket(new PacketPlayOutSpawnPosition(blockposition));
          playerconnection.sendPacket(new PacketPlayOutAbilities(entityplayer.abilities));
          playerconnection.sendPacket(new PacketPlayOutHeldItemSlot(entityplayer.inventory.itemInHandIndex));
diff --git a/Spigot-Server-Patches/0122-Remove-unused-World-Tile-Entity-List.patch b/Spigot-Server-Patches/0121-Remove-unused-World-Tile-Entity-List.patch
index 1f016acb36..de85bb4b7d 100644
--- a/Spigot-Server-Patches/0122-Remove-unused-World-Tile-Entity-List.patch
+++ b/Spigot-Server-Patches/0121-Remove-unused-World-Tile-Entity-List.patch
@@ -1,4 +1,4 @@
-From c0dabbd533b543eeffa6229e3b4aeec8fba3b92d Mon Sep 17 00:00:00 2001
+From 7c3fa5fe202b2951336d98e3a5050150b4d8fd93 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 13 Apr 2016 00:25:28 -0400
 Subject: [PATCH] Remove unused World Tile Entity List
@@ -67,5 +67,5 @@ index 34b10c4..71c5596 100644
              }
  
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0121-SPIGOT-1903-Update-PlayerConnection-on-teleporting-p.patch b/Spigot-Server-Patches/0121-SPIGOT-1903-Update-PlayerConnection-on-teleporting-p.patch
deleted file mode 100644
index 9b983c662b..0000000000
--- a/Spigot-Server-Patches/0121-SPIGOT-1903-Update-PlayerConnection-on-teleporting-p.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 31df39236b070e5486809b7eca2b6706c43814ff Mon Sep 17 00:00:00 2001
-From: Aikar <[email protected]>
-Date: Sun, 10 Apr 2016 22:36:10 -0400
-Subject: [PATCH] SPIGOT-1903: Update PlayerConnection on teleporting players
-
-Otherwise the player will trigger a "moved too quickly" next movement packet
-and rubber band.
-
-diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 966f9fd..5f134d0 100644
---- a/src/main/java/net/minecraft/server/Entity.java
-+++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -293,6 +293,7 @@ public abstract class Entity implements ICommandListener {
-         this.locX = d0;
-         this.locY = d1;
-         this.locZ = d2;
-+        if (this instanceof EntityPlayer && ((EntityPlayer) this).playerConnection != null) ((EntityPlayer) this).playerConnection.captureCurrentPosition(); // Paper
-         float f = this.width / 2.0F;
-         float f1 = this.length;
- 
-diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index eb4af2e..643a8e7 100644
---- a/src/main/java/net/minecraft/server/PlayerConnection.java
-+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -206,7 +206,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
- 
-     }
- 
--    private void d() {
-+    public void captureCurrentPosition() { d(); } private void d() { // Paper - OBFHELPER
-         this.l = this.player.locX;
-         this.m = this.player.locY;
-         this.n = this.player.locZ;
--- 
-2.9.3
-
diff --git a/Spigot-Server-Patches/0123-Don-t-tick-Skulls-unused-code.patch b/Spigot-Server-Patches/0122-Don-t-tick-Skulls-unused-code.patch
index 24700b8cae..d24bb0ffe8 100644
--- a/Spigot-Server-Patches/0123-Don-t-tick-Skulls-unused-code.patch
+++ b/Spigot-Server-Patches/0122-Don-t-tick-Skulls-unused-code.patch
@@ -1,4 +1,4 @@
-From 58796ebaa0bc32c6cf5a65a71644676a1f886363 Mon Sep 17 00:00:00 2001
+From a0198e446aba2732c1fcfe683f084402c3596ec5 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 13 Apr 2016 00:30:10 -0400
 Subject: [PATCH] Don't tick Skulls - unused code
@@ -18,5 +18,5 @@ index a8adbcb..ff5929f 100644
      private int a;
      public int rotation;
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0124-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0123-Configurable-Player-Collision.patch
index 6829ef420a..66e2ca5997 100644
--- a/Spigot-Server-Patches/0124-Configurable-Player-Collision.patch
+++ b/Spigot-Server-Patches/0123-Configurable-Player-Collision.patch
@@ -1,4 +1,4 @@
-From 26e04cf744907827b24b555c1e10f692c971710e Mon Sep 17 00:00:00 2001
+From f35b511e3a9ef80b3e980fa0d2f1928f26b8400a 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
@@ -37,7 +37,7 @@ index 8e5419d..64a3495 100644
                      }
                  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8e364de..a5ebb17 100644
+index e35341b..01325b3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -324,6 +324,14 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -69,10 +69,10 @@ index d8ec504..eb45d3c 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index a41bc5f..ea4c7ee 100644
+index d26da3a..eb846cf 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -67,6 +67,7 @@ public abstract class PlayerList {
+@@ -68,6 +68,7 @@ public abstract class PlayerList {
      // CraftBukkit start
      private CraftServer cserver;
      private final Map<String,EntityPlayer> playersByName = new org.spigotmc.CaseInsensitiveMap<EntityPlayer>();
@@ -80,7 +80,7 @@ index a41bc5f..ea4c7ee 100644
  
      public PlayerList(MinecraftServer minecraftserver) {
          this.cserver = minecraftserver.server = new CraftServer(minecraftserver, this);
-@@ -234,6 +235,12 @@ public abstract class PlayerList {
+@@ -235,6 +236,12 @@ public abstract class PlayerList {
          }
  
          entityplayer.syncInventory();
@@ -93,7 +93,7 @@ index a41bc5f..ea4c7ee 100644
          // CraftBukkit - Moved from above, added world
          PlayerList.f.info(entityplayer.getName() + "[" + s1 + "] logged in with entity id " + entityplayer.getId() + " at ([" + entityplayer.world.worldData.getName() + "]" + entityplayer.locX + ", " + entityplayer.locY + ", " + entityplayer.locZ + ")");
      }
-@@ -404,6 +411,16 @@ public abstract class PlayerList {
+@@ -405,6 +412,16 @@ public abstract class PlayerList {
          entityplayer.k_();// SPIGOT-924 // PAIL: rename - playerTick
          // CraftBukkit end
  
@@ -110,7 +110,7 @@ index a41bc5f..ea4c7ee 100644
          this.savePlayerFile(entityplayer);
          if (entityplayer.isPassenger()) {
              Entity entity = entityplayer.getVehicle();
-@@ -1302,7 +1319,13 @@ public abstract class PlayerList {
+@@ -1304,7 +1321,13 @@ public abstract class PlayerList {
              player.playerConnection.disconnect(this.server.server.getShutdownMessage()); // CraftBukkit - add custom shutdown message
          }
          // CraftBukkit end
diff --git a/Spigot-Server-Patches/0125-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/Spigot-Server-Patches/0124-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
index fff78f86b4..a95b151b19 100644
--- a/Spigot-Server-Patches/0125-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/Spigot-Server-Patches/0124-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
@@ -1,4 +1,4 @@
-From 5c270ca60b81177dc92acd54f577142611c1267b Mon Sep 17 00:00:00 2001
+From e476c7994be055e805e8aab6899869f8bf393fd6 Mon Sep 17 00:00:00 2001
 From: kashike <[email protected]>
 Date: Wed, 13 Apr 2016 20:21:38 -0700
 Subject: [PATCH] Add handshake event to allow plugins to handle client
@@ -45,5 +45,5 @@ index e6b6a5f..4924114 100644
                      if ( split.length == 3 || split.length == 4 ) {
                          packethandshakinginsetprotocol.hostname = split[0];
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0126-Water-mobs-should-only-spawn-in-the-water.patch b/Spigot-Server-Patches/0125-Water-mobs-should-only-spawn-in-the-water.patch
index 3b319af097..b9e5f3a4dd 100644
--- a/Spigot-Server-Patches/0126-Water-mobs-should-only-spawn-in-the-water.patch
+++ b/Spigot-Server-Patches/0125-Water-mobs-should-only-spawn-in-the-water.patch
@@ -1,4 +1,4 @@
-From d717b8e7a3dacbccd8efc83a643e200bd766cbbe Mon Sep 17 00:00:00 2001
+From ca06f314e5f7f982fb8a3ff52ebc2aa1d9d6556b Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Thu, 14 Apr 2016 17:48:56 -0500
 Subject: [PATCH] Water mobs should only spawn in the water
@@ -26,5 +26,5 @@ index 76394a3..e61f9a2 100644
  
      public boolean canSpawn() {
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0127-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch b/Spigot-Server-Patches/0126-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
index 2ed51da6ef..7dcb1a96b0 100644
--- a/Spigot-Server-Patches/0127-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
+++ b/Spigot-Server-Patches/0126-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
@@ -1,4 +1,4 @@
-From dfced2e8a52e47983a3c7639108fb9e1ef69740c Mon Sep 17 00:00:00 2001
+From 130bc3af336b71fe7026e8d297b782e3f551d441 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 14 Apr 2016 21:01:39 -0400
 Subject: [PATCH] Fix Bugs with Spigot Mob Spawn Logic
@@ -56,5 +56,5 @@ index ea0a145..689d664 100644
                          Iterator iterator1 = this.b.iterator();
  
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0128-Configurable-RCON-IP-address.patch b/Spigot-Server-Patches/0127-Configurable-RCON-IP-address.patch
index 6c9292fa9a..d25ca534ec 100644
--- a/Spigot-Server-Patches/0128-Configurable-RCON-IP-address.patch
+++ b/Spigot-Server-Patches/0127-Configurable-RCON-IP-address.patch
@@ -1,4 +1,4 @@
-From e6361230d793f51272a23b9dfb422507c5645cfd Mon Sep 17 00:00:00 2001
+From 50ce247e26363cb1a35cb4c757cb8ad4f0f7662d Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 16 Apr 2016 00:39:33 -0400
 Subject: [PATCH] Configurable RCON IP address
@@ -19,5 +19,5 @@ index a6a0d5a..efcafe7 100644
          if (0 == this.h) {
              this.h = this.i + 10;
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0129-Prevent-Fire-from-loading-chunks.patch b/Spigot-Server-Patches/0128-Prevent-Fire-from-loading-chunks.patch
index b5e75a135c..d2c4c56e28 100644
--- a/Spigot-Server-Patches/0129-Prevent-Fire-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0128-Prevent-Fire-from-loading-chunks.patch
@@ -1,4 +1,4 @@
-From 72649486d710ff8a72fa0d26f18ed110a679d3be Mon Sep 17 00:00:00 2001
+From 144397a2bbef30c05482b444852402488bccb5eb Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 17 Apr 2016 17:27:09 -0400
 Subject: [PATCH] Prevent Fire from loading chunks
@@ -45,5 +45,5 @@ index 1b91f58..c348221 100644
  
              return i;
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0130-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0129-Implement-PlayerLocaleChangeEvent.patch
index 06602e34f1..2896fcda6e 100644
--- a/Spigot-Server-Patches/0130-Implement-PlayerLocaleChangeEvent.patch
+++ b/Spigot-Server-Patches/0129-Implement-PlayerLocaleChangeEvent.patch
@@ -1,4 +1,4 @@
-From 1d59f02b06670f9f58a4065545dd94b61b81c174 Mon Sep 17 00:00:00 2001
+From 8d6e03df88f8b9738fec770cc10219cba1b9f55c Mon Sep 17 00:00:00 2001
 From: Isaac Moore <[email protected]>
 Date: Tue, 19 Apr 2016 14:09:31 -0500
 Subject: [PATCH] Implement PlayerLocaleChangeEvent
@@ -34,7 +34,7 @@ index e9baaa2..d084fc2 100644
          this.ci = 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 5b6d4aa..3c63d1f 100644
+index aff5f44..67a3722 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1675,7 +1675,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -50,5 +50,5 @@ index 5b6d4aa..3c63d1f 100644
  
          @Override
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0131-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-Server-Patches/0130-EntityRegainHealthEvent-isFastRegen-API.patch
index 1f84d8eae4..1f2f364e12 100644
--- a/Spigot-Server-Patches/0131-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/Spigot-Server-Patches/0130-EntityRegainHealthEvent-isFastRegen-API.patch
@@ -1,4 +1,4 @@
-From 8b08f744ef059f26814f4abaf18e2e338f764168 Mon Sep 17 00:00:00 2001
+From dc171fdf1622f27a12047757050f62aedb1a7e79 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Fri, 22 Apr 2016 01:43:11 -0500
 Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
@@ -41,5 +41,5 @@ index 3a7ce8d..46acda8 100644
                  this.foodTickTimer = 0;
              }
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0132-Add-ability-to-configure-frosted_ice-properties.patch b/Spigot-Server-Patches/0131-Add-ability-to-configure-frosted_ice-properties.patch
index 90f5d6471d..749236d810 100644
--- a/Spigot-Server-Patches/0132-Add-ability-to-configure-frosted_ice-properties.patch
+++ b/Spigot-Server-Patches/0131-Add-ability-to-configure-frosted_ice-properties.patch
@@ -1,4 +1,4 @@
-From 78f6ceb0064ea2747fa625a3a36ce88ae912afab Mon Sep 17 00:00:00 2001
+From a0a7521252ef02cc44ae990c6a84e526265ef51d Mon Sep 17 00:00:00 2001
 From: kashike <[email protected]>
 Date: Thu, 21 Apr 2016 23:51:55 -0700
 Subject: [PATCH] Add ability to configure frosted_ice properties
@@ -44,5 +44,5 @@ index 8f502b9..bddfea0 100644
  
      }
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0133-Vehicle-Event-Cancellation-Changes.patch b/Spigot-Server-Patches/0132-Vehicle-Event-Cancellation-Changes.patch
index 557ccfa95b..68980fbaea 100644
--- a/Spigot-Server-Patches/0133-Vehicle-Event-Cancellation-Changes.patch
+++ b/Spigot-Server-Patches/0132-Vehicle-Event-Cancellation-Changes.patch
@@ -1,14 +1,14 @@
-From 4bd6e01e211901f94be1376c9311fb394a931e63 Mon Sep 17 00:00:00 2001
+From 5b0e21a8998e4a9da0cc086a93a4d4e8334b02a4 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Fri, 22 Apr 2016 18:20:05 -0500
 Subject: [PATCH] Vehicle Event Cancellation Changes
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 5f134d0..6950acf 100644
+index 966f9fd..6ab5b04 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1700,6 +1700,10 @@ public abstract class Entity implements ICommandListener {
+@@ -1699,6 +1699,10 @@ public abstract class Entity implements ICommandListener {
      }
  
      public boolean a(Entity entity, boolean flag) {
@@ -19,7 +19,7 @@ index 5f134d0..6950acf 100644
          if (!flag && (!this.n(entity) || !entity.q(this))) {
              return false;
          } else {
-@@ -1708,7 +1712,7 @@ public abstract class Entity implements ICommandListener {
+@@ -1707,7 +1711,7 @@ public abstract class Entity implements ICommandListener {
              }
  
              this.au = entity;
@@ -28,7 +28,7 @@ index 5f134d0..6950acf 100644
              return true;
          }
      }
-@@ -1735,12 +1739,20 @@ public abstract class Entity implements ICommandListener {
+@@ -1734,12 +1738,20 @@ public abstract class Entity implements ICommandListener {
      }
  
      protected void o(Entity entity) {
@@ -49,7 +49,7 @@ index 5f134d0..6950acf 100644
              CraftEntity craft = (CraftEntity) entity.getBukkitEntity().getVehicle();
              Entity orig = craft == null ? null : craft.getHandle();
              if (getBukkitEntity() instanceof Vehicle && entity.getBukkitEntity() instanceof LivingEntity && entity.world.isChunkLoaded((int) entity.locX >> 4, (int) entity.locZ >> 4, false)) { // Boolean not used
-@@ -1763,6 +1775,8 @@ public abstract class Entity implements ICommandListener {
+@@ -1762,6 +1774,8 @@ public abstract class Entity implements ICommandListener {
                  return;
              }
              // Spigot end
@@ -58,7 +58,7 @@ index 5f134d0..6950acf 100644
              if (!this.world.isClientSide && entity instanceof EntityHuman && !(this.bw() instanceof EntityHuman)) {
                  this.passengers.add(0, entity);
              } else {
-@@ -1788,16 +1802,29 @@ public abstract class Entity implements ICommandListener {
+@@ -1787,16 +1801,29 @@ public abstract class Entity implements ICommandListener {
                  CraftEntity craftn = (CraftEntity) entity.getBukkitEntity().getVehicle();
                  Entity n = craftn == null ? null : craftn.getHandle();
                  if (event.isCancelled() || n != orig) {
@@ -90,5 +90,5 @@ index 5f134d0..6950acf 100644
          return this.bx().size() < 1;
      }
 -- 
-2.10.1.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0134-Arrow-pickup-rule-API.patch b/Spigot-Server-Patches/0133-Arrow-pickup-rule-API.patch
index ddf46fe900..bd9ea42acc 100644
--- a/Spigot-Server-Patches/0134-Arrow-pickup-rule-API.patch
+++ b/Spigot-Server-Patches/0133-Arrow-pickup-rule-API.patch
@@ -1,4 +1,4 @@
-From d9c348e694dd50b9bdae8ed4aaf91dabff55b519 Mon Sep 17 00:00:00 2001
+From d79e914dc33ddb6b92ceb3bac2fbad9083d15082 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <[email protected]>
 Date: Fri, 4 Mar 2016 03:16:11 -0500
 Subject: [PATCH] Arrow pickup rule API
@@ -54,5 +54,5 @@ index 2a3482c..fbf289f 100644
      private final Arrow.Spigot spigot = new Arrow.Spigot()
      {
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0135-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch b/Spigot-Server-Patches/0134-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
index 0f4537cab8..21cc873145 100644
--- a/Spigot-Server-Patches/0135-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
+++ b/Spigot-Server-Patches/0134-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch
@@ -1,4 +1,4 @@
-From 2a951c9f066b67a6db6a9278353e6e59835eb25f Mon Sep 17 00:00:00 2001
+From 18a87a492e0ebb90e6af71a9a705fd873bc3d60a Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Sun, 24 Apr 2016 19:49:33 -0500
 Subject: [PATCH] SPIGOT-1401: Fix dispenser, dropper, furnace placement
@@ -51,5 +51,5 @@ index 61a6b8a..25f7b4b 100644
      public boolean interact(World world, BlockPosition blockposition, IBlockData iblockdata, EntityHuman entityhuman, EnumHand enumhand, @Nullable ItemStack itemstack, EnumDirection enumdirection, float f, float f1, float f2) {
          if (world.isClientSide) {
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0136-Improve-Minecraft-Hopper-Performance.patch b/Spigot-Server-Patches/0135-Improve-Minecraft-Hopper-Performance.patch
index 06fe72c417..9abb97d12c 100644
--- a/Spigot-Server-Patches/0136-Improve-Minecraft-Hopper-Performance.patch
+++ b/Spigot-Server-Patches/0135-Improve-Minecraft-Hopper-Performance.patch
@@ -1,4 +1,4 @@
-From 0fff7c225ea6e505c6b8c70ac074c67aed84737d Mon Sep 17 00:00:00 2001
+From b3b4eb9469067c56b7ed140b5e473f374bead215 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 27 Apr 2016 22:09:52 -0400
 Subject: [PATCH] Improve Minecraft Hopper Performance
@@ -66,5 +66,5 @@ index d1ce2b9..a651961 100644
          return this.g > 0;
      }
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0137-remove-null-possibility-for-getServer-singleton.patch b/Spigot-Server-Patches/0136-remove-null-possibility-for-getServer-singleton.patch
index 568f1e0927..4247b9db45 100644
--- a/Spigot-Server-Patches/0137-remove-null-possibility-for-getServer-singleton.patch
+++ b/Spigot-Server-Patches/0136-remove-null-possibility-for-getServer-singleton.patch
@@ -1,4 +1,4 @@
-From 45a81c0386108c5e75ed02ff0e0752e9f7753417 Mon Sep 17 00:00:00 2001
+From ba8cbe80928ba8473d215dccef5cbe2e2684ccbc Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 28 Apr 2016 00:57:27 -0400
 Subject: [PATCH] remove null possibility for getServer singleton
@@ -6,7 +6,7 @@ Subject: [PATCH] remove null possibility for getServer singleton
 to stop IDE complaining about potential NPE
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a5ebb17..6fbe9e6 100644
+index 01325b3..9455475 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -49,6 +49,7 @@ import co.aikar.timings.MinecraftTimings; // Paper
@@ -25,7 +25,7 @@ index a5ebb17..6fbe9e6 100644
          io.netty.util.ResourceLeakDetector.setEnabled( false ); // Spigot - disable
          this.e = proxy;
          this.U = yggdrasilauthenticationservice;
-@@ -1605,7 +1607,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -1603,7 +1605,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
      // CraftBukkit start
      @Deprecated
      public static MinecraftServer getServer() {
diff --git a/Spigot-Server-Patches/0138-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/Spigot-Server-Patches/0137-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index 7f20618dc0..6c4e2c1983 100644
--- a/Spigot-Server-Patches/0138-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/Spigot-Server-Patches/0137-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
@@ -1,4 +1,4 @@
-From d554f157aaf7bd0b13337733d67e5062a32521cc Mon Sep 17 00:00:00 2001
+From 26411724ca061061a106c890f7a2ebaeb562ca6f Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 29 Apr 2016 20:02:00 -0400
 Subject: [PATCH] Improve Maps (in item frames) performance and bug fixes
@@ -145,5 +145,5 @@ index 256a131..5768cd5 100644
  
      public RenderData() {
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0139-LootTable-API-Replenishable-Lootables-Feature.patch b/Spigot-Server-Patches/0138-LootTable-API-Replenishable-Lootables-Feature.patch
index 0f60191700..11d4df48dd 100644
--- a/Spigot-Server-Patches/0139-LootTable-API-Replenishable-Lootables-Feature.patch
+++ b/Spigot-Server-Patches/0138-LootTable-API-Replenishable-Lootables-Feature.patch
@@ -1,4 +1,4 @@
-From 9b89c7828d3ae27caf2ad7c4e8aee73e5c4f2f2b Mon Sep 17 00:00:00 2001
+From 93d2ba949a9f934fe3152622f6bec3783f598bdf Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 1 May 2016 21:19:14 -0400
 Subject: [PATCH] LootTable API & Replenishable Lootables Feature
diff --git a/Spigot-Server-Patches/0140-Do-not-load-chunks-for-pathfinding.patch b/Spigot-Server-Patches/0139-Do-not-load-chunks-for-pathfinding.patch
index eca2b8ad06..5b4b4c0f32 100644
--- a/Spigot-Server-Patches/0140-Do-not-load-chunks-for-pathfinding.patch
+++ b/Spigot-Server-Patches/0139-Do-not-load-chunks-for-pathfinding.patch
@@ -1,4 +1,4 @@
-From 70f5e6b8db75750b358ce6dabe3a4ea4f69b7263 Mon Sep 17 00:00:00 2001
+From c1be666366724109693f64c165f5755918b56c8d Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 19 Jan 2016 00:13:19 -0500
 Subject: [PATCH] Do not load chunks for pathfinding
@@ -18,5 +18,5 @@ index 08b986f..786d1dd 100644
          }
  
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0141-Entity-Tracking-Improvements.patch b/Spigot-Server-Patches/0140-Entity-Tracking-Improvements.patch
index da0a250fa2..1442dd7394 100644
--- a/Spigot-Server-Patches/0141-Entity-Tracking-Improvements.patch
+++ b/Spigot-Server-Patches/0140-Entity-Tracking-Improvements.patch
@@ -1,4 +1,4 @@
-From a6a8914a4d8f045b6cced8533e214241ad577d01 Mon Sep 17 00:00:00 2001
+From 238ef72e181b6d3baccc788f1d18150b4ba280ff Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 17 Jun 2013 01:24:00 -0400
 Subject: [PATCH] Entity Tracking Improvements
@@ -7,7 +7,7 @@ If any part of a Vehicle/Passenger relationship is visible to a player,
 send all passenger/vehicles to the player in the chain.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index afbc204..059042e 100644
+index 6ab5b04..abd3b7a 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -52,6 +52,7 @@ public abstract class Entity implements ICommandListener {
@@ -99,5 +99,5 @@ index f505e3c..c2113d7 100644
  
      }
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0142-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/Spigot-Server-Patches/0141-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
index 8351f3a41c..831f052643 100644
--- a/Spigot-Server-Patches/0142-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
+++ b/Spigot-Server-Patches/0141-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
@@ -1,11 +1,11 @@
-From 7721a93822a2fa9fc0f16f325ed36f7ea13bf761 Mon Sep 17 00:00:00 2001
+From 85b07be021a9d0a0e38869187e91e9e444434121 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 7 May 2016 23:33:08 -0400
 Subject: [PATCH] Don't save empty scoreboard teams to scoreboard.dat
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index e6e7739..82e6365 100644
+index a3f4c1f..ecf18eb 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -215,4 +215,9 @@ public class PaperConfig {
@@ -31,5 +31,5 @@ index 230004b..62752f8 100644
  
              nbttagcompound.setString("Name", scoreboardteam.getName());
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0143-Do-not-mark-chunks-as-active-for-neighbor-updates.patch b/Spigot-Server-Patches/0142-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
index ec33ed6a14..1d715f4dee 100644
--- a/Spigot-Server-Patches/0143-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
+++ b/Spigot-Server-Patches/0142-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
@@ -1,4 +1,4 @@
-From 3997e8d790922ae9f871e773b89df69e3603dba1 Mon Sep 17 00:00:00 2001
+From 83d7ab2cb698e496c3c1a68fc86cccc338bc769b Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 12 May 2016 01:55:17 -0400
 Subject: [PATCH] Do not mark chunks as active for neighbor updates
@@ -44,5 +44,5 @@ index 0ee8a13..1ec820f 100644
              if (chunk4 != null) {
                  chunk4.a(chunkgenerator);
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0144-Fix-Chunk-Unload-Queue-Issues.patch b/Spigot-Server-Patches/0143-Fix-Chunk-Unload-Queue-Issues.patch
index f7690babe5..d456a3d4d6 100644
--- a/Spigot-Server-Patches/0144-Fix-Chunk-Unload-Queue-Issues.patch
+++ b/Spigot-Server-Patches/0143-Fix-Chunk-Unload-Queue-Issues.patch
@@ -1,4 +1,4 @@
-From 78a3b6853055e9d9675199c3b53cbff2e469ba30 Mon Sep 17 00:00:00 2001
+From 753f76b3d779e04899d7916a3bc28172e550f1ec Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 12 May 2016 02:03:56 -0400
 Subject: [PATCH] Fix Chunk Unload Queue Issues
@@ -22,7 +22,7 @@ index 1ec820f..b0453ca 100644
  
      // Paper start
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index d4587c7..804a0ca 100644
+index 37fac92..9d0bd6f 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -289,6 +289,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -34,5 +34,5 @@ index d4587c7..804a0ca 100644
                              continue;
                          }
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0145-System-property-for-disabling-watchdoge.patch b/Spigot-Server-Patches/0144-System-property-for-disabling-watchdoge.patch
index 87553966cf..d44a61bdf0 100644
--- a/Spigot-Server-Patches/0145-System-property-for-disabling-watchdoge.patch
+++ b/Spigot-Server-Patches/0144-System-property-for-disabling-watchdoge.patch
@@ -1,4 +1,4 @@
-From ba9bd40106462da733ff34ab75818eb1e4f909cb Mon Sep 17 00:00:00 2001
+From b1de1dda47090e2a4b8eb2f52e33ba405d338106 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Thu, 12 May 2016 23:02:58 -0500
 Subject: [PATCH] System property for disabling watchdoge
@@ -18,5 +18,5 @@ index 3ed983c..fb57e0d 100644
                  Logger log = Bukkit.getServer().getLogger();
                  log.log( Level.SEVERE, "The server has stopped responding!" );
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0146-Optimize-EAR.patch b/Spigot-Server-Patches/0145-Optimize-EAR.patch
index a65d605236..bdddaf95ef 100644
--- a/Spigot-Server-Patches/0146-Optimize-EAR.patch
+++ b/Spigot-Server-Patches/0145-Optimize-EAR.patch
@@ -1,4 +1,4 @@
-From 72b3cf583161fb407f82938a0f8f4a93dff22696 Mon Sep 17 00:00:00 2001
+From 94998573aa681f314d5f584f240574580ba919f9 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 13 May 2016 01:38:06 -0400
 Subject: [PATCH] Optimize EAR
@@ -65,5 +65,5 @@ index c4ed64a..4a4d64e 100644
                  }
              }
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0147-Optimize-UserCache-Thread-Safe.patch b/Spigot-Server-Patches/0146-Optimize-UserCache-Thread-Safe.patch
index 4616c26e50..869de576af 100644
--- a/Spigot-Server-Patches/0147-Optimize-UserCache-Thread-Safe.patch
+++ b/Spigot-Server-Patches/0146-Optimize-UserCache-Thread-Safe.patch
@@ -1,4 +1,4 @@
-From a6d4f7801444aaf0bb3fb0f32d1290163721369f Mon Sep 17 00:00:00 2001
+From 3cb0b6d7c63707cbd9f2b2c7c043f82fc5eda9e6 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 16 May 2016 20:47:41 -0400
 Subject: [PATCH] Optimize UserCache / Thread Safe
@@ -10,7 +10,7 @@ Additionally, move Saving of the User cache to be done async, incase
 the user never changed the default setting for Spigot's save on stop only.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6fbe9e6..8ca8fbf 100644
+index 9455475..a4f7e4d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -508,7 +508,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -96,5 +96,5 @@ index ccfc755..989758c 100644
      }
  
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0148-Avoid-blocking-on-Network-Manager-creation.patch b/Spigot-Server-Patches/0147-Avoid-blocking-on-Network-Manager-creation.patch
index df063e9311..07c166853c 100644
--- a/Spigot-Server-Patches/0148-Avoid-blocking-on-Network-Manager-creation.patch
+++ b/Spigot-Server-Patches/0147-Avoid-blocking-on-Network-Manager-creation.patch
@@ -1,4 +1,4 @@
-From cfa9670f71909f78fadc59118fbb42c5ca7959f4 Mon Sep 17 00:00:00 2001
+From 4e7010c88892330d42b3824575b42558c43540bb Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 16 May 2016 23:19:16 -0400
 Subject: [PATCH] Avoid blocking on Network Manager creation
@@ -45,5 +45,5 @@ index 5b0488a..8906d7c 100644
              if ( org.spigotmc.SpigotConfig.playerShuffle > 0 && MinecraftServer.currentTick % org.spigotmc.SpigotConfig.playerShuffle == 0 )
              {
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0149-Optional-old-TNT-cannon-behaviors.patch b/Spigot-Server-Patches/0148-Optional-old-TNT-cannon-behaviors.patch
index cba18fb218..acdfa757f9 100644
--- a/Spigot-Server-Patches/0149-Optional-old-TNT-cannon-behaviors.patch
+++ b/Spigot-Server-Patches/0148-Optional-old-TNT-cannon-behaviors.patch
@@ -1,4 +1,4 @@
-From 97eadebda44f3490ac37b185007ca725234a701e Mon Sep 17 00:00:00 2001
+From 1118c99292b787d46d36d393fbf1e68a870f8c58 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Sun, 22 May 2016 20:20:55 -0500
 Subject: [PATCH] Optional old TNT cannon behaviors
@@ -208,10 +208,10 @@ index 61735bb..41bd6e5 100644
                     world.getServer().getPluginManager().callEvent(event);
                  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index bade448..a67c212 100644
+index abd3b7a..3c36124 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -980,6 +980,12 @@ public abstract class Entity implements ICommandListener {
+@@ -979,6 +979,12 @@ public abstract class Entity implements ICommandListener {
      }
  
      public boolean ak() {
@@ -224,7 +224,7 @@ index bade448..a67c212 100644
          if (this.bB() instanceof EntityBoat) {
              this.inWater = false;
          } else if (this.world.a(this.getBoundingBox().grow(0.0D, -0.4000000059604645D, 0.0D).shrink(0.001D), Material.WATER, this)) {
-@@ -1181,6 +1187,12 @@ public abstract class Entity implements ICommandListener {
+@@ -1180,6 +1186,12 @@ public abstract class Entity implements ICommandListener {
      }
  
      public double f(double d0, double d1, double d2) {
@@ -237,7 +237,7 @@ index bade448..a67c212 100644
          double d3 = this.locX - d0;
          double d4 = this.locY - d1;
          double d5 = this.locZ - d2;
-@@ -1235,6 +1247,12 @@ public abstract class Entity implements ICommandListener {
+@@ -1234,6 +1246,12 @@ public abstract class Entity implements ICommandListener {
      }
  
      public void g(double d0, double d1, double d2) {
@@ -250,7 +250,7 @@ index bade448..a67c212 100644
          this.motX += d0;
          this.motY += d1;
          this.motZ += d2;
-@@ -2360,6 +2378,12 @@ public abstract class Entity implements ICommandListener {
+@@ -2359,6 +2377,12 @@ public abstract class Entity implements ICommandListener {
      }
  
      public boolean bg() {
@@ -391,5 +391,5 @@ index 6cdc3a3..0b9bc91 100644
                              EntityHuman entityhuman = (EntityHuman) entity;
  
 -- 
-2.10.1.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0150-Faster-redstone-torch-rapid-clock-removal.patch b/Spigot-Server-Patches/0149-Faster-redstone-torch-rapid-clock-removal.patch
index 571115c05b..c742faa168 100644
--- a/Spigot-Server-Patches/0150-Faster-redstone-torch-rapid-clock-removal.patch
+++ b/Spigot-Server-Patches/0149-Faster-redstone-torch-rapid-clock-removal.patch
@@ -1,4 +1,4 @@
-From e71fd9b4b4702a0696ec04989b089ce14d552b3e Mon Sep 17 00:00:00 2001
+From 76851a9642f1529fa292e87aee5f449356b20776 Mon Sep 17 00:00:00 2001
 From: Martin Panzer <[email protected]>
 Date: Mon, 23 May 2016 12:12:37 +0200
 Subject: [PATCH] Faster redstone torch rapid clock removal
@@ -39,5 +39,5 @@ index 7866bd9..606f982 100644
          public RedstoneUpdateInfo(BlockPosition blockposition, long i) {
              this.a = blockposition;
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0151-Ensure-Chunks-never-ever-load-async.patch b/Spigot-Server-Patches/0150-Ensure-Chunks-never-ever-load-async.patch
index f6882f35dd..39513a1cd2 100644
--- a/Spigot-Server-Patches/0151-Ensure-Chunks-never-ever-load-async.patch
+++ b/Spigot-Server-Patches/0150-Ensure-Chunks-never-ever-load-async.patch
@@ -1,4 +1,4 @@
-From 62db4aaef486a25c551d384a766254144f398495 Mon Sep 17 00:00:00 2001
+From 67b0b1e0bd6c369b0266a2533cf2f96a36410acb Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 27 May 2016 21:41:26 -0400
 Subject: [PATCH] Ensure Chunks never ever load async
@@ -42,5 +42,5 @@ index b5efb9c..ef9529a 100644
              return;
          }
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0152-Add-server-name-parameter.patch b/Spigot-Server-Patches/0151-Add-server-name-parameter.patch
index 99db1b6ee2..114b53a95f 100644
--- a/Spigot-Server-Patches/0152-Add-server-name-parameter.patch
+++ b/Spigot-Server-Patches/0151-Add-server-name-parameter.patch
@@ -1,4 +1,4 @@
-From 51392d298660f38a042f81f9191e78110ad5989c Mon Sep 17 00:00:00 2001
+From 792a41e4a8564f50f81fcebba2313f430314b1e7 Mon Sep 17 00:00:00 2001
 From: Martin Panzer <[email protected]>
 Date: Sat, 28 May 2016 16:54:03 +0200
 Subject: [PATCH] Add server-name parameter
@@ -24,5 +24,5 @@ index 979adad..2aad1e8 100644
          };
  
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0153-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch b/Spigot-Server-Patches/0152-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
index 37b15c49de..c77718feca 100644
--- a/Spigot-Server-Patches/0153-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
+++ b/Spigot-Server-Patches/0152-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
@@ -1,4 +1,4 @@
-From f68a321f88b0ffcbbc13a6590fe9235f5b26b616 Mon Sep 17 00:00:00 2001
+From d663cba92f0a0e9a2c2b3dc45b35f758ffb24016 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 31 May 2016 22:53:50 -0400
 Subject: [PATCH] Only send Dragon/Wither Death sounds to same world
@@ -44,5 +44,5 @@ index 48b5b2c..6749211 100644
                      double deltaZ = this.locZ - player.locZ;
                      double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0154-Fix-FallingBlocks-being-stuck-on-fences.patch b/Spigot-Server-Patches/0153-Fix-FallingBlocks-being-stuck-on-fences.patch
index 44462b6f04..0a6bcca759 100644
--- a/Spigot-Server-Patches/0154-Fix-FallingBlocks-being-stuck-on-fences.patch
+++ b/Spigot-Server-Patches/0153-Fix-FallingBlocks-being-stuck-on-fences.patch
@@ -1,4 +1,4 @@
-From 16b6ee261a933a76d6c60f1af4ad7cb1cd1b7e73 Mon Sep 17 00:00:00 2001
+From 31effe329c315350ced8e35a5e5836101dbbb3ae Mon Sep 17 00:00:00 2001
 From: Martin Panzer <[email protected]>
 Date: Fri, 3 Jun 2016 23:13:39 +0200
 Subject: [PATCH] Fix FallingBlocks being stuck on fences
@@ -101,5 +101,5 @@ index 4fd4371..dcfdd31 100644
          Block block = this.block.getBlock();
  
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0155-Make-entities-look-for-hoppers.patch b/Spigot-Server-Patches/0154-Make-entities-look-for-hoppers.patch
index 900f094862..7212ddffa2 100644
--- a/Spigot-Server-Patches/0155-Make-entities-look-for-hoppers.patch
+++ b/Spigot-Server-Patches/0154-Make-entities-look-for-hoppers.patch
@@ -1,4 +1,4 @@
-From f4c96964d2f893ecac513c8759c888a36395424d Mon Sep 17 00:00:00 2001
+From ccbab8adeb660a94e4f12664a70158626de51419 Mon Sep 17 00:00:00 2001
 From: Techcable <[email protected]>
 Date: Sat, 18 Jun 2016 01:01:37 -0500
 Subject: [PATCH] Make entities look for hoppers
@@ -144,7 +144,7 @@ index d6cc51b..5bbaa87 100644
              this.b = i;
              this.c = j;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 7fc3e57..57988e2 100644
+index 3c36124..4039317 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -78,6 +78,19 @@ public abstract class Entity implements ICommandListener {
@@ -168,7 +168,7 @@ index 7fc3e57..57988e2 100644
      public double motY;
      public double motZ;
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 234c547..86be072 100644
+index 310c013..2795c1a 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -6,8 +6,15 @@ import javax.annotation.Nullable;
@@ -382,5 +382,5 @@ index a651961..1f5de89 100644
  
              if (!list.isEmpty()) {
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0156-Remove-the-item-from-the-correct-hand-when-spawn-egg.patch b/Spigot-Server-Patches/0155-Remove-the-item-from-the-correct-hand-when-spawn-egg.patch
index fc6ccb6a67..470f6a3e38 100644
--- a/Spigot-Server-Patches/0156-Remove-the-item-from-the-correct-hand-when-spawn-egg.patch
+++ b/Spigot-Server-Patches/0155-Remove-the-item-from-the-correct-hand-when-spawn-egg.patch
@@ -1,4 +1,4 @@
-From 3c7d1a025675485ca08a251f4f5463bb32cdb840 Mon Sep 17 00:00:00 2001
+From 52d29c8c800096b1ae9a8769b1e3490a51e5beb9 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 18 Jun 2016 01:49:22 -0400
 Subject: [PATCH] Remove the item from the correct hand when spawn egg depletes
@@ -30,5 +30,5 @@ index 526a608..c0c60a7 100644
          if (enumhand == EnumHand.MAIN_HAND) {
              this.setSlot(EnumItemSlot.MAINHAND, itemstack);
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0157-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0156-Delay-Chunk-Unloads-based-on-Player-Movement.patch
index 582572f082..41d17d57aa 100644
--- a/Spigot-Server-Patches/0157-Delay-Chunk-Unloads-based-on-Player-Movement.patch
+++ b/Spigot-Server-Patches/0156-Delay-Chunk-Unloads-based-on-Player-Movement.patch
@@ -1,4 +1,4 @@
-From 18cec5d14ced4ca22349dea910203e837031cecc Mon Sep 17 00:00:00 2001
+From 55462a92013d43eb2b79ab16e59c62434e526f33 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 18 Jun 2016 23:22:12 -0400
 Subject: [PATCH] Delay Chunk Unloads based on Player Movement
@@ -47,7 +47,7 @@ index b0453ca..683a6dd 100644
      public final int locZ;
      private boolean m;
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 804a0ca..1ba02f1 100644
+index 9d0bd6f..3828da7 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -299,6 +299,19 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -140,5 +140,5 @@ index e85a0a0..c28c505 100644
              }
  
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0158-Toggleable-Elytra-Wall-Damage.patch b/Spigot-Server-Patches/0157-Toggleable-Elytra-Wall-Damage.patch
index 32b4772379..3a9579179b 100644
--- a/Spigot-Server-Patches/0158-Toggleable-Elytra-Wall-Damage.patch
+++ b/Spigot-Server-Patches/0157-Toggleable-Elytra-Wall-Damage.patch
@@ -1,4 +1,4 @@
-From 2288e7a229b738e7de1ee68ba4e2131f788c50d4 Mon Sep 17 00:00:00 2001
+From ea17b15308036b862db32ff6cf226095909ec210 Mon Sep 17 00:00:00 2001
 From: Jadon Fowler <[email protected]>
 Date: Sat, 18 Jun 2016 23:13:59 -0700
 Subject: [PATCH] Toggleable Elytra Wall Damage
@@ -41,5 +41,5 @@ index c0c60a7..8c98a19 100644
                  if (this.onGround && !this.world.isClientSide) {
                      if (getFlag(7) && !CraftEventFactory.callToggleGlideEvent(this, false).isCancelled()) // CraftBukkit
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0159-Fix-Double-World-Add-issues.patch b/Spigot-Server-Patches/0158-Fix-Double-World-Add-issues.patch
index 2effe80b3c..b697e044b6 100644
--- a/Spigot-Server-Patches/0159-Fix-Double-World-Add-issues.patch
+++ b/Spigot-Server-Patches/0158-Fix-Double-World-Add-issues.patch
@@ -1,4 +1,4 @@
-From 5ac6ef5ec3966a96a72feb81de1f03c8b4a049d4 Mon Sep 17 00:00:00 2001
+From 108c2e5e0381bc97414192d9dd61e42e4fdd93bd Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 21 Jun 2016 22:54:34 -0400
 Subject: [PATCH] Fix Double World Add issues
@@ -8,7 +8,7 @@ Vanilla will double add Spider Jockeys to the world, so ignore already added.
 Also add debug if something else tries to, and abort before world gets bad state
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index eb36e1f..3a46a0a 100644
+index 854fbd7..b672a38 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -523,7 +523,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -33,5 +33,5 @@ index 1d47a11..f7d9a7c 100644
          int i = MathHelper.floor(entity.locX / 16.0D);
          int j = MathHelper.floor(entity.locZ / 16.0D);
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0160-Fix-Old-Sign-Conversion.patch b/Spigot-Server-Patches/0159-Fix-Old-Sign-Conversion.patch
index 1214320216..459af63c1c 100644
--- a/Spigot-Server-Patches/0160-Fix-Old-Sign-Conversion.patch
+++ b/Spigot-Server-Patches/0159-Fix-Old-Sign-Conversion.patch
@@ -1,4 +1,4 @@
-From 6d6666240e69a1d3d0d99abb53cba217342fbd38 Mon Sep 17 00:00:00 2001
+From 8444305ca3681b5614c8649fb0bc7c13ad064fc9 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Fri, 17 Jun 2016 20:50:11 -0400
 Subject: [PATCH] Fix Old Sign Conversion
@@ -67,5 +67,5 @@ index 5694ff7..f5ba2dd 100644
                  try {
                      this.lines[i] = ChatComponentUtils.filterForDisplay(icommandlistener, ichatbasecomponent, (Entity) null);
 -- 
-2.10.0.windows.1
+2.9.3
 
diff --git a/Spigot-Server-Patches/0161-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/Spigot-Server-Patches/0160-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
index e295471011..9a12b8da6c 100644
--- a/Spigot-Server-Patches/0161-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
+++ b/Spigot-Server-Patches/0160-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
@@ -1,4 +1,4 @@
-From fe188eddc55c94500583679f02ce99c1a45c4843 Mon Sep 17 00:00:00 2001
+From f817b89f08f583bfe833f01895e5e37b77c79083 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Sat, 16 Jul 2016 19:11:17 -0500
 Subject: [PATCH] Don't lookup game profiles that have no UUID and no name
@@ -18,5 +18,5 @@ index 989758c..1c619c5 100644
              GameProfile gameprofile = new GameProfile(uuid, s);
  
 -- 
-2.10.0
+2.9.3
 
diff --git a/Spigot-Server-Patches/0162-More-informative-vehicle-moved-wrongly-message.patch b/Spigot-Server-Patches/0161-More-informative-vehicle-moved-wrongly-message.patch
index e9f7ae7384..2e275c4840 100644
--- a/Spigot-Server-Patches/0162-More-informative-vehicle-moved-wrongly-message.patch
+++ b/Spigot-Server-Patches/0161-More-informative-vehicle-moved-wrongly-message.patch
@@ -1,11 +1,11 @@
-From 4985b099705964ad8ee14b8952f135839291a1c7 Mon Sep 17 00:00:00 2001
+From 6afb5fa60e5424d24bddedb3e6812c9791b4768b Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 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 643a8e7..11870cd 100644
+index eb4af2e..5a55f86 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -345,7 +345,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0163-Re-track-players-that-dismount-from-other-players.patch b/Spigot-Server-Patches/0162-Re-track-players-that-dismount-from-other-players.patch
index d808228128..f7737c4c0f 100644
--- a/Spigot-Server-Patches/0163-Re-track-players-that-dismount-from-other-players.patch
+++ b/Spigot-Server-Patches/0162-Re-track-players-that-dismount-from-other-players.patch
@@ -1,4 +1,4 @@
-From 43cab707048fcf57959710da853803e5c7b0f1e1 Mon Sep 17 00:00:00 2001
+From 985ad542fefc2c7c6701e3b87df6a54752bcc58b Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Sun, 31 Jul 2016 16:33:03 -0500
 Subject: [PATCH] Re-track players that dismount from other players
@@ -23,5 +23,5 @@ index d084fc2..ec3a60a 100644
      }
  
 -- 
-2.10.0
+2.9.3
 
diff --git a/Spigot-Server-Patches/0164-Add-setting-for-proxy-online-mode-status.patch b/Spigot-Server-Patches/0163-Add-setting-for-proxy-online-mode-status.patch
index 5fb6ba2975..58be5acdad 100644
--- a/Spigot-Server-Patches/0164-Add-setting-for-proxy-online-mode-status.patch
+++ b/Spigot-Server-Patches/0163-Add-setting-for-proxy-online-mode-status.patch
@@ -1,4 +1,4 @@
-From c8174cd77412dae0abef65ec95504e78645689fb Mon Sep 17 00:00:00 2001
+From 1af870b576aae5783fe40da1ec502b0f67ed4efc Mon Sep 17 00:00:00 2001
 From: Gabriele C <[email protected]>
 Date: Fri, 5 Aug 2016 01:03:08 +0200
 Subject: [PATCH] Add setting for proxy online mode status
@@ -47,5 +47,5 @@ index 100142e..4fb9c5e 100644
                  profile = console.getUserCache().getProfile( name );
              }
 -- 
-2.10.0
+2.9.3
 
diff --git a/Spigot-Server-Patches/0165-Optimise-BlockStateEnum-hashCode-and-equals.patch b/Spigot-Server-Patches/0164-Optimise-BlockStateEnum-hashCode-and-equals.patch
index 8ea40947d3..0886aefa0c 100644
--- a/Spigot-Server-Patches/0165-Optimise-BlockStateEnum-hashCode-and-equals.patch
+++ b/Spigot-Server-Patches/0164-Optimise-BlockStateEnum-hashCode-and-equals.patch
@@ -1,4 +1,4 @@
-From a1bfad07929148b106e494ae6e1ae158f987755c Mon Sep 17 00:00:00 2001
+From 15ce05737a55c54bfa0fb16f55bf697886954f82 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <[email protected]>
 Date: Fri, 19 Aug 2016 01:52:56 +0100
 Subject: [PATCH] Optimise BlockStateEnum hashCode and equals
@@ -58,5 +58,5 @@ index 288c52c..66c459d 100644
  
      public static <T extends Enum<T> & INamable> BlockStateEnum<T> of(String s, Class<T> oclass) {
 -- 
-2.10.0
+2.9.3
 
diff --git a/Spigot-Server-Patches/0166-Disable-ticking-of-snow-blocks.patch b/Spigot-Server-Patches/0165-Disable-ticking-of-snow-blocks.patch
index 0398667a71..1e24cf9a56 100644
--- a/Spigot-Server-Patches/0166-Disable-ticking-of-snow-blocks.patch
+++ b/Spigot-Server-Patches/0165-Disable-ticking-of-snow-blocks.patch
@@ -1,4 +1,4 @@
-From 1bb2986f9b28b8ce72d4edcd0c202190261856c6 Mon Sep 17 00:00:00 2001
+From daf29f80106970b4f6c0b77b3e3aced3cbab90f7 Mon Sep 17 00:00:00 2001
 From: killme <[email protected]>
 Date: Tue, 30 Aug 2016 16:39:48 +0200
 Subject: [PATCH] Disable ticking of snow blocks
@@ -34,5 +34,5 @@ index 1c43a37..a3b1998 100644
 +    //Paper end
  }
 -- 
-2.10.0
+2.9.3
 
diff --git a/Spigot-Server-Patches/0167-Convert-new-health-to-a-float-during-set.patch b/Spigot-Server-Patches/0166-Convert-new-health-to-a-float-during-set.patch
index a9e79e25f8..d9545e18ec 100644
--- a/Spigot-Server-Patches/0167-Convert-new-health-to-a-float-during-set.patch
+++ b/Spigot-Server-Patches/0166-Convert-new-health-to-a-float-during-set.patch
@@ -1,4 +1,4 @@
-From 87609705a4c0c86119a8deeb7f4b31325cca030a Mon Sep 17 00:00:00 2001
+From 50c7fd9737b110863a6c0e98044df83866d2e782 Mon Sep 17 00:00:00 2001
 From: kashike <[email protected]>
 Date: Thu, 1 Sep 2016 09:51:31 +0000
 Subject: [PATCH] Convert new health to a float during set
@@ -18,5 +18,5 @@ index b807a3f..9e19e7c 100644
              // Paper - Be more informative
              throw new IllegalArgumentException("Health must be between 0 and " + getMaxHealth() + ", but was " + health
 -- 
-2.10.0
+2.9.3
 
diff --git a/Spigot-Server-Patches/0168-Fix-AIOOBE-in-inventory-handling.patch b/Spigot-Server-Patches/0167-Fix-AIOOBE-in-inventory-handling.patch
index 2082f65aa2..bd30a5ed92 100644
--- a/Spigot-Server-Patches/0168-Fix-AIOOBE-in-inventory-handling.patch
+++ b/Spigot-Server-Patches/0167-Fix-AIOOBE-in-inventory-handling.patch
@@ -1,11 +1,11 @@
-From 24da669ca98bf8b5667a3a9c9f9ade3d0c7e9fb5 Mon Sep 17 00:00:00 2001
+From 872a064a40696f3e19fc8b2b0c733334124c28e6 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <[email protected]>
 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 11870cd..ecafc26 100644
+index 5a55f86..18a455e 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1824,7 +1824,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0169-Configurable-packet-in-spam-threshold.patch b/Spigot-Server-Patches/0168-Configurable-packet-in-spam-threshold.patch
index 462e94a5d8..a8cdd89861 100644
--- a/Spigot-Server-Patches/0169-Configurable-packet-in-spam-threshold.patch
+++ b/Spigot-Server-Patches/0168-Configurable-packet-in-spam-threshold.patch
@@ -1,4 +1,4 @@
-From afc5c3843f515c8ef06d628dc607ba73c0890754 Mon Sep 17 00:00:00 2001
+From f1fd52fce2177f5e93443e89ccc16a00028d1c6c Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Sun, 11 Sep 2016 14:30:57 -0500
 Subject: [PATCH] Configurable packet in spam threshold
@@ -23,7 +23,7 @@ index 91546b6..211b88a 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index ecafc26..e583138 100644
+index 18a455e..00b645e 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 {
diff --git a/Spigot-Server-Patches/0170-Configurable-flying-kick-messages.patch b/Spigot-Server-Patches/0169-Configurable-flying-kick-messages.patch
index 5f23d42b0e..79937d42d4 100644
--- a/Spigot-Server-Patches/0170-Configurable-flying-kick-messages.patch
+++ b/Spigot-Server-Patches/0169-Configurable-flying-kick-messages.patch
@@ -1,4 +1,4 @@
-From 28d1c2b967f2ff6fb5edfc2919dbe6c1d8dac797 Mon Sep 17 00:00:00 2001
+From 465abb72cac9eeb154ee4a3d1538324897c65ab4 Mon Sep 17 00:00:00 2001
 From: kashike <[email protected]>
 Date: Tue, 20 Sep 2016 00:58:01 +0000
 Subject: [PATCH] Configurable flying kick messages
@@ -21,7 +21,7 @@ index 211b88a..3161dad 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index e583138..56138b6 100644
+index 00b645e..59f7020 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -145,7 +145,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
diff --git a/Spigot-Server-Patches/0171-Auto-Save-Improvements.patch b/Spigot-Server-Patches/0170-Auto-Save-Improvements.patch
index 8f28081165..13ea94fc02 100644
--- a/Spigot-Server-Patches/0171-Auto-Save-Improvements.patch
+++ b/Spigot-Server-Patches/0170-Auto-Save-Improvements.patch
@@ -1,4 +1,4 @@
-From 288acc02847ff43dfa0ba7a8e0bb91767b14c6a2 Mon Sep 17 00:00:00 2001
+From 5f8378d558d5891a25c0a347c4a4879f3ef35c05 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
@@ -55,7 +55,7 @@ index 683a6dd..547628a 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 1ba02f1..65de280 100644
+index 3828da7..7e53fee 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -1,5 +1,6 @@
@@ -75,7 +75,7 @@ index 1ba02f1..65de280 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8ca8fbf..c19bde9 100644
+index a4f7e4d..fb06496 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -114,6 +114,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -86,12 +86,11 @@ index 8ca8fbf..c19bde9 100644
      // CraftBukkit end
  
      public MinecraftServer(OptionSet options, Proxy proxy, DataConverterManager dataconvertermanager, YggdrasilAuthenticationService yggdrasilauthenticationservice, MinecraftSessionService minecraftsessionservice, GameProfileRepository gameprofilerepository, UserCache usercache) {
-@@ -745,24 +746,28 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -745,22 +746,26 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
              this.q.b().a(agameprofile);
          }
  
 -        if (autosavePeriod > 0 && this.ticks % autosavePeriod == 0) { // CraftBukkit
-             MinecraftTimings.worldSaveTimer.startTiming(); // Spigot
              this.methodProfiler.a("save");
 +
 +        serverAutoSave = (autosavePeriod > 0 && this.ticks % autosavePeriod == 0); // Paper
@@ -112,31 +111,34 @@ index 8ca8fbf..c19bde9 100644
              // this.saveChunks(true);
              // Spigot End
              this.methodProfiler.b();
-             MinecraftTimings.worldSaveTimer.stopTiming(); // Spigot
 -        }
 +        //} // Paper - Incremental Auto Saving
  
          this.methodProfiler.a("tallying");
          this.h[this.ticks % 100] = System.nanoTime() - i;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 24b79d3..9e38304 100644
+index fc33575..81712ff 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -1017,12 +1017,12 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -1017,8 +1017,9 @@ public class WorldServer extends World implements IAsyncTaskHandler {
          ChunkProviderServer chunkproviderserver = this.getChunkProviderServer();
  
          if (chunkproviderserver.e()) {
 -            org.bukkit.Bukkit.getPluginManager().callEvent(new org.bukkit.event.world.WorldSaveEvent(getWorld())); // CraftBukkit
 +            if (flag) org.bukkit.Bukkit.getPluginManager().callEvent(new org.bukkit.event.world.WorldSaveEvent(getWorld())); // CraftBukkit // Paper - Incremental Auto Saving - Only fire event on full save
+             timings.worldSave.startTiming(); // Paper
++            if (flag || server.serverAutoSave) { // Paper
              if (iprogressupdate != null) {
                  iprogressupdate.a("Saving level");
              }
- 
--            this.a();
-+            if (flag || server.serverAutoSave) this.a(); // Paper
+@@ -1027,6 +1028,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
              if (iprogressupdate != null) {
                  iprogressupdate.c("Saving chunks");
              }
++            } // Paper
+ 
+             timings.worldSaveChunks.startTiming(); // Paper
+             chunkproviderserver.a(flag);
 -- 
 2.9.3
 
diff --git a/Spigot-Server-Patches/0172-Chunk-registration-fixes.patch b/Spigot-Server-Patches/0171-Chunk-registration-fixes.patch
index 5124767ffe..3158a03aeb 100644
--- a/Spigot-Server-Patches/0172-Chunk-registration-fixes.patch
+++ b/Spigot-Server-Patches/0171-Chunk-registration-fixes.patch
@@ -1,4 +1,4 @@
-From 759bf7de29d799f60c5c2abe6594ff4fdac06d3c Mon Sep 17 00:00:00 2001
+From c4ec0ab8720ecb9ad022d3347f0de493b3e5c951 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 21 Sep 2016 22:54:28 -0400
 Subject: [PATCH] Chunk registration fixes
@@ -21,5 +21,5 @@ index f7d9a7c..9eaab84 100644
  
              if (!entity.ab || entity.ac != k || entity.ad != l || entity.ae != i1) {
 -- 
-2.10.0
+2.9.3
 
diff --git a/Spigot-Server-Patches/0173-Process-NMS-Data-Conversion-post-ItemMeta-on-Copy.patch b/Spigot-Server-Patches/0172-Process-NMS-Data-Conversion-post-ItemMeta-on-Copy.patch
index e838d77129..c2e1337a63 100644
--- a/Spigot-Server-Patches/0173-Process-NMS-Data-Conversion-post-ItemMeta-on-Copy.patch
+++ b/Spigot-Server-Patches/0172-Process-NMS-Data-Conversion-post-ItemMeta-on-Copy.patch
@@ -1,4 +1,4 @@
-From a00026a267f7b82fd9fa666b008a5e2f2e4f84d7 Mon Sep 17 00:00:00 2001
+From 757ec2bb90744f04fce7b35c7e93e16ddb95a538 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 4 May 2016 22:31:18 -0400
 Subject: [PATCH] Process NMS Data Conversion post ItemMeta on Copy
@@ -61,5 +61,5 @@ index 88f0292..7f77d44 100644
      }
  
 -- 
-2.10.0
+2.9.3
 
diff --git a/Spigot-Server-Patches/0174-Remove-FishingHook-reference-on-Craft-Entity-removal.patch b/Spigot-Server-Patches/0173-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
index c7f2e14011..d81f520730 100644
--- a/Spigot-Server-Patches/0174-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
+++ b/Spigot-Server-Patches/0173-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
@@ -1,4 +1,4 @@
-From 9392526a42291798757abda1942e41d5fc2d8ef8 Mon Sep 17 00:00:00 2001
+From ec7b47649a8b1c4b036818f3fc798c9cac2025fb Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 16 Jun 2016 00:17:23 -0400
 Subject: [PATCH] Remove FishingHook reference on Craft Entity removal
@@ -26,5 +26,5 @@ index ecfc316..3f909c1 100644
      public LivingEntity _INVALID_getShooter() {
          return (LivingEntity) getShooter();
 -- 
-2.10.0
+2.9.3
 
diff --git a/Spigot-Server-Patches/0175-Auto-fix-bad-Y-levels-on-player-login.patch b/Spigot-Server-Patches/0174-Auto-fix-bad-Y-levels-on-player-login.patch
index b99080f052..c3ad2b95e8 100644
--- a/Spigot-Server-Patches/0175-Auto-fix-bad-Y-levels-on-player-login.patch
+++ b/Spigot-Server-Patches/0174-Auto-fix-bad-Y-levels-on-player-login.patch
@@ -1,4 +1,4 @@
-From dd9660855df152cd179f5c3a21c7ab645b70ece5 Mon Sep 17 00:00:00 2001
+From e01f697ab9cfa02790a92041949e7b407a0e3723 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 21 Sep 2016 23:48:39 -0400
 Subject: [PATCH] Auto fix bad Y levels on player login
@@ -18,5 +18,5 @@ index ec3a60a..da2b5bb 100644
      }
  
 -- 
-2.10.0
+2.9.3
 
diff --git a/Spigot-Server-Patches/0176-Raise-string-limit-for-packet-serialization.patch b/Spigot-Server-Patches/0175-Raise-string-limit-for-packet-serialization.patch
index aa2994e2fa..cef6b86061 100644
--- a/Spigot-Server-Patches/0176-Raise-string-limit-for-packet-serialization.patch
+++ b/Spigot-Server-Patches/0175-Raise-string-limit-for-packet-serialization.patch
@@ -1,4 +1,4 @@
-From 37b1119fcaf9a311e2cd20262498d11e598466f6 Mon Sep 17 00:00:00 2001
+From 2cf81206a3da85b16153b908df063ec1527a6c88 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 21 Sep 2016 23:54:20 -0400
 Subject: [PATCH] Raise string limit for packet serialization
@@ -23,5 +23,5 @@ index b056457..662bd1e 100644
              this.d(abyte.length);
              this.writeBytes(abyte);
 -- 
-2.10.0
+2.9.3
 
diff --git a/Spigot-Server-Patches/0177-Disable-Vanilla-Chunk-GC.patch b/Spigot-Server-Patches/0176-Disable-Vanilla-Chunk-GC.patch
index 7624688174..f849b324ca 100644
--- a/Spigot-Server-Patches/0177-Disable-Vanilla-Chunk-GC.patch
+++ b/Spigot-Server-Patches/0176-Disable-Vanilla-Chunk-GC.patch
@@ -1,4 +1,4 @@
-From 7ae69904dd5672eb9be2e2e8ff7d45a9cc41c829 Mon Sep 17 00:00:00 2001
+From 749b88d2159fe452ccb51881004c3f878b5977c4 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 26 Sep 2016 01:51:30 -0400
 Subject: [PATCH] Disable Vanilla Chunk GC
@@ -6,26 +6,26 @@ Subject: [PATCH] Disable Vanilla Chunk GC
 Bukkit has its own system for this.
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 9e38304..7c91625 100644
+index 81712ff..5c07180 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -1029,7 +1029,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
- 
+@@ -1034,7 +1034,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
              chunkproviderserver.a(flag);
+             timings.worldSaveChunks.stopTiming(); // Paper
              // CraftBukkit - ArrayList -> Collection
 -            Collection arraylist = chunkproviderserver.a();
 +            /* //Paper start Collection arraylist = chunkproviderserver.a();
              Iterator iterator = arraylist.iterator();
  
              while (iterator.hasNext()) {
-@@ -1038,7 +1038,8 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -1043,7 +1043,8 @@ public class WorldServer extends World implements IAsyncTaskHandler {
                  if (chunk != null && !this.manager.a(chunk.locX, chunk.locZ)) {
                      chunkproviderserver.unload(chunk);
                  }
 -            }
 +            }*/
 +            // Paper end
- 
+             timings.worldSave.stopTiming(); // Paper
          }
      }
 -- 
diff --git a/Spigot-Server-Patches/0178-Add-hit-entity-to-ProjectileHitEvent.patch b/Spigot-Server-Patches/0177-Add-hit-entity-to-ProjectileHitEvent.patch
index dd0135d9ad..713d5d3137 100644
--- a/Spigot-Server-Patches/0178-Add-hit-entity-to-ProjectileHitEvent.patch
+++ b/Spigot-Server-Patches/0177-Add-hit-entity-to-ProjectileHitEvent.patch
@@ -1,4 +1,4 @@
-From 6e566525947b294d8825015c511d8dabd630af8e Mon Sep 17 00:00:00 2001
+From 05ef428d5cc669cc3d36fc7065beb194f4611be1 Mon Sep 17 00:00:00 2001
 From: AlphaBlend <[email protected]>
 Date: Wed, 21 Sep 2016 20:40:46 -0700
 Subject: [PATCH] Add hit entity to ProjectileHitEvent
@@ -77,5 +77,5 @@ index e39de2b..949db83 100644
          ThrownExpBottle bottle = (ThrownExpBottle) entity.getBukkitEntity();
          ExpBottleEvent event = new ExpBottleEvent(bottle, exp);
 -- 
-2.10.0
+2.9.3
 
diff --git a/Spigot-Server-Patches/0179-Option-to-remove-corrupt-tile-entities.patch b/Spigot-Server-Patches/0178-Option-to-remove-corrupt-tile-entities.patch
index b22f7371ef..624bf2d268 100644
--- a/Spigot-Server-Patches/0179-Option-to-remove-corrupt-tile-entities.patch
+++ b/Spigot-Server-Patches/0178-Option-to-remove-corrupt-tile-entities.patch
@@ -1,4 +1,4 @@
-From d7bacc4801ac21c5a432cc5a47ab4ffa053f48bb Mon Sep 17 00:00:00 2001
+From 2371c3f9301dfe640f384b35b08b2d1f06cf4038 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Wed, 5 Oct 2016 16:27:36 -0500
 Subject: [PATCH] Option to remove corrupt tile entities
@@ -41,5 +41,5 @@ index 547628a..9f39530 100644
          if (this.j) {
              TileEntity tileentity = (TileEntity) this.tileEntities.remove(blockposition);
 -- 
-2.10.0
+2.9.3