diff --git a/Spigot-Server-Patches/0005-Timings-v2.patch b/Spigot-Server-Patches/0005-Timings-v2.patch
index ff3a6ac43..3ed1cae62 100644
--- a/Spigot-Server-Patches/0005-Timings-v2.patch
+++ b/Spigot-Server-Patches/0005-Timings-v2.patch
@@ -1,4 +1,4 @@
-From 9034cdd7c79fadd996c42af76984a42082af1e9f Mon Sep 17 00:00:00 2001
+From f2a025a171a77bc14b98e605f6f9541cd56be33c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
@@ -324,7 +324,7 @@ index 973e2c5..2e8deba 100644
  
      public boolean aa() {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 064b7a9..c0e6dc8 100644
+index 6ac7f42..e6d11ee 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -24,7 +24,8 @@ import org.bukkit.block.BlockFace;
@@ -710,7 +710,7 @@ index b0249ff..797a84f 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index ed97c65..888a7c5 100644
+index d1e2fdc..1a39ba3 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -57,6 +57,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -721,7 +721,7 @@ index ed97c65..888a7c5 100644
  // CraftBukkit end
  
  public class PlayerConnection implements PacketListenerPlayIn, ITickable {
-@@ -1329,7 +1330,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1332,7 +1333,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
      // CraftBukkit end
  
     private void handleCommand(String s) {
@@ -730,7 +730,7 @@ index ed97c65..888a7c5 100644
         // CraftBukkit start - whole method
          if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
          this.LOGGER.info(this.player.getName() + " issued server command: " + s);
-@@ -1340,22 +1341,22 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1343,22 +1344,22 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          this.server.getPluginManager().callEvent(event);
  
          if (event.isCancelled()) {
@@ -778,7 +778,7 @@ index 42f37df..2b82312 100644
      private static final Map<String, Class<? extends TileEntity>> f = Maps.newHashMap();
      private static final Map<Class<? extends TileEntity>, String> g = Maps.newHashMap();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 4abeccd..2a23122 100644
+index 4dfe963..474c85b 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;
@@ -850,7 +850,7 @@ index 4abeccd..2a23122 100644
                      crashreport1 = CrashReport.a(throwable1, "Ticking entity");
                      crashreportsystemdetails1 = crashreport1.a("Entity being ticked");
                      entity.appendEntityCrashDetails(crashreportsystemdetails1);
-@@ -1564,6 +1568,7 @@ public abstract class World implements IBlockAccess {
+@@ -1565,6 +1569,7 @@ public abstract class World implements IBlockAccess {
          }
  
          timings.tileEntityPending.stopTiming(); // Spigot
@@ -858,7 +858,7 @@ index 4abeccd..2a23122 100644
          this.methodProfiler.b();
          this.methodProfiler.b();
      }
-@@ -1609,7 +1614,6 @@ public abstract class World implements IBlockAccess {
+@@ -1610,7 +1615,6 @@ public abstract class World implements IBlockAccess {
              entity.ticksLived++;
              entity.inactiveTick();
          } else {
@@ -866,7 +866,7 @@ index 4abeccd..2a23122 100644
              // CraftBukkit end
              entity.M = entity.locX;
              entity.N = entity.locY;
-@@ -1618,6 +1622,7 @@ public abstract class World implements IBlockAccess {
+@@ -1619,6 +1623,7 @@ public abstract class World implements IBlockAccess {
              entity.lastPitch = entity.pitch;
              if (flag && entity.ab) {
                  ++entity.ticksLived;
@@ -874,7 +874,7 @@ index 4abeccd..2a23122 100644
                  if (entity.isPassenger()) {
                      entity.aw();
                  } else {
-@@ -1676,8 +1681,6 @@ public abstract class World implements IBlockAccess {
+@@ -1677,8 +1682,6 @@ public abstract class World implements IBlockAccess {
                      }
                  }
              }
@@ -1412,5 +1412,5 @@ index 30efc99..eb30abe 100644
      }
  }
 -- 
-2.8.3
+2.8.3.windows.1
 
diff --git a/Spigot-Server-Patches/0006-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0006-Vanished-players-don-t-have-rights.patch
index d2d605576..8edf65af9 100644
--- a/Spigot-Server-Patches/0006-Vanished-players-don-t-have-rights.patch
+++ b/Spigot-Server-Patches/0006-Vanished-players-don-t-have-rights.patch
@@ -1,11 +1,11 @@
-From 44e34ae1a703d858ed23c66eda926d6d3f4b31e2 Mon Sep 17 00:00:00 2001
+From a002ab51d4a94a1f228127a6c51279cfe506e461 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 21:20:21 -0600
 Subject: [PATCH] Vanished players don't have rights
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index cd2f7be..91fda88 100644
+index 8d52140..ccbf47e 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -189,6 +189,14 @@ public abstract class EntityArrow extends Entity implements IProjectile {
@@ -75,10 +75,10 @@ index 3b6feb7..1450483 100644
              IBlockData iblockdata1 = this.a.getPlacedState(world, blockposition, enumdirection, f, f1, f2, i, entityhuman);
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 2a23122..f8c8e4b 100644
+index 474c85b..9d6aefe 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1694,6 +1694,14 @@ public abstract class World implements IBlockAccess {
+@@ -1695,6 +1695,14 @@ public abstract class World implements IBlockAccess {
          for (int i = 0; i < list.size(); ++i) {
              Entity entity1 = (Entity) list.get(i);
  
@@ -94,5 +94,5 @@ index 2a23122..f8c8e4b 100644
                  return false;
              }
 -- 
-2.8.3
+2.8.3.windows.1
 
diff --git a/Spigot-Server-Patches/0012-Toggle-for-player-interact-limiter.patch b/Spigot-Server-Patches/0012-Toggle-for-player-interact-limiter.patch
index 89df30e47..04469946a 100644
--- a/Spigot-Server-Patches/0012-Toggle-for-player-interact-limiter.patch
+++ b/Spigot-Server-Patches/0012-Toggle-for-player-interact-limiter.patch
@@ -1,4 +1,4 @@
-From 6fbbdb0f26fb7350a19ffb2d5647f5e8c7d88925 Mon Sep 17 00:00:00 2001
+From e0a86e364a8ce22e9465fdbb332de75844adfc1a Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 13:31:05 -0600
 Subject: [PATCH] Toggle for player interact limiter
@@ -22,10 +22,10 @@ index 7739e78..87bae87 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 155030d..378cc6e 100644
+index 1a39ba3..5bbb644 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -911,7 +911,8 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -914,7 +914,8 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          this.player.resetIdleTimer();
          // Spigot start
          boolean throttled = false;
@@ -36,5 +36,5 @@ index 155030d..378cc6e 100644
          } else if ( packetplayinblockplace.timestamp - lastPlace >= 30 || lastPlace == -1 )
          {
 -- 
-2.8.3
+2.8.3.windows.1
 
diff --git a/Spigot-Server-Patches/0019-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0019-Player-affects-spawning-API.patch
index 69150f11d..d4578e0bf 100644
--- a/Spigot-Server-Patches/0019-Player-affects-spawning-API.patch
+++ b/Spigot-Server-Patches/0019-Player-affects-spawning-API.patch
@@ -1,4 +1,4 @@
-From ba8fc1510d97add8edc358ee242c8227ac70afd7 Mon Sep 17 00:00:00 2001
+From 7653d093e465320d7d08f09d05c647a3f714801a Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Tue, 1 Mar 2016 14:47:52 -0600
 Subject: [PATCH] Player affects spawning API
@@ -111,7 +111,7 @@ index f8a871d..55c36fc 100644
                                                          biomebase_biomemeta = worldserver.a(enumcreaturetype, (BlockPosition) blockposition_mutableblockposition);
                                                          if (biomebase_biomemeta == null) {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index c110c74..da6b78b 100644
+index 558e700..d2953a7 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -3,6 +3,7 @@
@@ -122,7 +122,7 @@ index c110c74..da6b78b 100644
  import com.google.common.collect.Lists;
  import java.util.ArrayList;
  import java.util.Calendar;
-@@ -2705,16 +2706,31 @@ public abstract class World implements IBlockAccess {
+@@ -2706,16 +2707,31 @@ public abstract class World implements IBlockAccess {
  
      @Nullable
      public EntityHuman findNearbyPlayer(Entity entity, double d0) {
@@ -156,7 +156,7 @@ index c110c74..da6b78b 100644
          double d4 = -1.0D;
          EntityHuman entityhuman = null;
  
-@@ -2726,6 +2742,8 @@ public abstract class World implements IBlockAccess {
+@@ -2727,6 +2743,8 @@ public abstract class World implements IBlockAccess {
              }
              // CraftBukkit end
  
@@ -165,7 +165,7 @@ index c110c74..da6b78b 100644
              if ((IEntitySelector.d.apply(entityhuman1) || !flag) && (IEntitySelector.e.apply(entityhuman1) || flag)) {
                  double d5 = entityhuman1.e(d0, d1, d2);
  
-@@ -2740,9 +2758,17 @@ public abstract class World implements IBlockAccess {
+@@ -2741,9 +2759,17 @@ public abstract class World implements IBlockAccess {
      }
  
      public boolean isPlayerNearby(double d0, double d1, double d2, double d3) {
@@ -205,5 +205,5 @@ index 6b3bbfe..11e3028 100644
      private final Player.Spigot spigot = new Player.Spigot()
      {
 -- 
-2.8.3
+2.8.3.windows.1
 
diff --git a/Spigot-Server-Patches/0027-Prevent-tile-entity-and-entity-crashes.patch b/Spigot-Server-Patches/0027-Prevent-tile-entity-and-entity-crashes.patch
index 0bb48c10c..d5c7ee844 100644
--- a/Spigot-Server-Patches/0027-Prevent-tile-entity-and-entity-crashes.patch
+++ b/Spigot-Server-Patches/0027-Prevent-tile-entity-and-entity-crashes.patch
@@ -1,4 +1,4 @@
-From 3106f00428fd110497311c7e99e77a7eddea260a Mon Sep 17 00:00:00 2001
+From 68a72eaea8d7ded8e658aebf0bc89951e62c99bb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 Mar 2016 23:52:34 -0600
 Subject: [PATCH] Prevent tile entity and entity crashes
@@ -23,7 +23,7 @@ index 2b82312..9fa93ed 100644
                  public String a() throws Exception {
                      int i = Block.getId(TileEntity.this.world.getType(TileEntity.this.position).getBlock());
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index ae37a79..aa2b984 100644
+index 8b133c1..746438f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1445,10 +1445,12 @@ public abstract class World implements IBlockAccess {
@@ -43,7 +43,7 @@ index ae37a79..aa2b984 100644
                  }
              }
  
-@@ -1510,10 +1512,13 @@ public abstract class World implements IBlockAccess {
+@@ -1511,10 +1513,13 @@ public abstract class World implements IBlockAccess {
                          ((ITickable) tileentity).E_();
                          this.methodProfiler.b();
                      } catch (Throwable throwable2) {
@@ -62,5 +62,5 @@ index ae37a79..aa2b984 100644
                      // Spigot start
                      finally {
 -- 
-2.8.3
+2.8.3.windows.1
 
diff --git a/Spigot-Server-Patches/0050-Disable-spigot-tick-limiters.patch b/Spigot-Server-Patches/0050-Disable-spigot-tick-limiters.patch
index 8ffcf455e..5a2aa0727 100644
--- a/Spigot-Server-Patches/0050-Disable-spigot-tick-limiters.patch
+++ b/Spigot-Server-Patches/0050-Disable-spigot-tick-limiters.patch
@@ -1,11 +1,11 @@
-From 3cb5989f9a4ba05b40fb8382228dae8d8c4a7ffe Mon Sep 17 00:00:00 2001
+From 0127334be1d39b225f0f7257a5fd53b1bb453122 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 23:45:17 -0600
 Subject: [PATCH] Disable spigot tick limiters
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f2c3409..0b3360c 100644
+index f9c803f..c8c7a41 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1422,10 +1422,10 @@ public abstract class World implements IBlockAccess {
@@ -23,7 +23,7 @@ index f2c3409..0b3360c 100644
              tickPosition = (tickPosition < entityList.size()) ? tickPosition : 0;
              entity = (Entity) this.entityList.get(this.tickPosition);
              // CraftBukkit end
-@@ -1490,9 +1490,7 @@ public abstract class World implements IBlockAccess {
+@@ -1491,9 +1491,7 @@ public abstract class World implements IBlockAccess {
          // Spigot start
          // Iterator iterator = this.tileEntityListTick.iterator();
          int tilesThisCycle = 0;
@@ -35,5 +35,5 @@ index f2c3409..0b3360c 100644
              TileEntity tileentity = (TileEntity) this.tileEntityListTick.get(tileTickPosition);
              // Spigot start
 -- 
-2.8.3
+2.8.3.windows.1
 
diff --git a/Spigot-Server-Patches/0056-Ensure-commands-are-not-ran-async.patch b/Spigot-Server-Patches/0056-Ensure-commands-are-not-ran-async.patch
index c4e613903..98eb4cbef 100644
--- a/Spigot-Server-Patches/0056-Ensure-commands-are-not-ran-async.patch
+++ b/Spigot-Server-Patches/0056-Ensure-commands-are-not-ran-async.patch
@@ -1,4 +1,4 @@
-From d7200d536c15065d8c3f6c6f8ff92d40afefaed4 Mon Sep 17 00:00:00 2001
+From e9038be64bae5e4e2766f01c41a4d74d67a2437f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 01:17:12 -0600
 Subject: [PATCH] Ensure commands are not ran async
@@ -14,10 +14,10 @@ big slowdown in execution but throwing an exception at same time to raise awaren
 that it is happening so that plugin authors can fix their code to stop executing commands async.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 378cc6e..efca444 100644
+index 5bbb644..9abe333 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1263,6 +1263,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1266,6 +1266,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          }
  
          if (!async && s.startsWith("/")) {
@@ -82,5 +82,5 @@ index 408ef34..541b8d8 100644
              return true;
          }
 -- 
-2.8.3
+2.8.3.windows.1
 
diff --git a/Spigot-Server-Patches/0071-Add-exception-reporting-event.patch b/Spigot-Server-Patches/0071-Add-exception-reporting-event.patch
index 38658805b..1973c77c3 100644
--- a/Spigot-Server-Patches/0071-Add-exception-reporting-event.patch
+++ b/Spigot-Server-Patches/0071-Add-exception-reporting-event.patch
@@ -1,4 +1,4 @@
-From d6e73e258479bda08f27d3362756a543610458f0 Mon Sep 17 00:00:00 2001
+From 80c1bfdf97a5e070c7e68f95f38573e30abaac07 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 03:15:41 -0600
 Subject: [PATCH] Add exception reporting event
@@ -225,7 +225,7 @@ index e18e9bc..2badf24 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index 01a08d4..5eb01c3 100644
+index 49fa5e4..2121e84 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -1,5 +1,6 @@
@@ -292,7 +292,7 @@ index e40fd93..d1458aa 100644
              }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 47036e1..6b2875d 100644
+index 2bf74ea..d54ff64 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1,5 +1,7 @@
@@ -315,7 +315,7 @@ index 47036e1..6b2875d 100644
                      entity.dead = true;
                      continue;
                      // Paper end
-@@ -1518,8 +1522,10 @@ public abstract class World implements IBlockAccess {
+@@ -1519,8 +1523,10 @@ public abstract class World implements IBlockAccess {
                          this.methodProfiler.b();
                      } catch (Throwable throwable2) {
                          // Paper start - Prevent tile entity and entity crashes
@@ -372,5 +372,5 @@ index 2a22697..d82dddf 100644
                  // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
              }
 -- 
-2.8.3
+2.8.3.windows.1
 
diff --git a/Spigot-Server-Patches/0075-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0075-Complete-resource-pack-API.patch
index 8bedbf579..d9d1d033d 100644
--- a/Spigot-Server-Patches/0075-Complete-resource-pack-API.patch
+++ b/Spigot-Server-Patches/0075-Complete-resource-pack-API.patch
@@ -1,14 +1,14 @@
-From e7aaa78fba39628af819e63138d45f15f9055342 Mon Sep 17 00:00:00 2001
+From 83bebd36fa79bf8d27b4f23405728e5acb42fb5f Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 4 Apr 2015 23:17:52 -0400
 Subject: [PATCH] Complete resource pack API
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 120e52a..8cd02b3 100644
+index 9abe333..cb1169c 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1024,7 +1024,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1027,7 +1027,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
  
      // CraftBukkit start
      public void a(PacketPlayInResourcePackStatus packetplayinresourcepackstatus) {
@@ -72,5 +72,5 @@ index 101dc2b..9299695 100644
      private final Player.Spigot spigot = new Player.Spigot()
      {
 -- 
-2.8.3
+2.8.3.windows.1
 
diff --git a/Spigot-Server-Patches/0117-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-Server-Patches/0117-Add-PlayerUseUnknownEntityEvent.patch
index 56c1a1df1..f326e6e70 100644
--- a/Spigot-Server-Patches/0117-Add-PlayerUseUnknownEntityEvent.patch
+++ b/Spigot-Server-Patches/0117-Add-PlayerUseUnknownEntityEvent.patch
@@ -1,4 +1,4 @@
-From ec3e0c6cdfe781da6c20398e962127cb84bf89b4 Mon Sep 17 00:00:00 2001
+From 549c18ba79d697266a1e8f900e6c0a9feeede245 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 2 Apr 2016 05:09:16 -0400
 Subject: [PATCH] Add PlayerUseUnknownEntityEvent
@@ -18,10 +18,10 @@ index 2b23a5d..6464a84 100644
      private Vec3D c;
      private EnumHand d;
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 9e75986..8c6233d 100644
+index cb1169c..06c4f12 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1613,6 +1613,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1616,6 +1616,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                  }
              }
          }
@@ -39,5 +39,5 @@ index 9e75986..8c6233d 100644
      }
  
 -- 
-2.8.3
+2.8.3.windows.1
 
diff --git a/Spigot-Server-Patches/0120-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0120-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index 03140c626..8f0857057 100644
--- a/Spigot-Server-Patches/0120-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/0120-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -1,4 +1,4 @@
-From ecb2e5c1740f7325d86987a01a452fb9b49c5f77 Mon Sep 17 00:00:00 2001
+From 4ba2f736cb2b1cc395ca4499377bec36a907180d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 13 Sep 2014 23:14:43 -0400
 Subject: [PATCH] Configurable Keep Spawn Loaded range per world
@@ -21,7 +21,7 @@ index 2374419..d6fef83 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5aaec82..1347ce2 100644
+index 64868c0..bfa6836 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -353,8 +353,9 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -37,10 +37,10 @@ index 5aaec82..1347ce2 100644
  
                      if (i1 - j > 1000L) {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 7e6b3e6..bf1ac49 100644
+index e508be3..5b2b8de 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -3232,8 +3232,9 @@ public abstract class World implements IBlockAccess {
+@@ -3233,8 +3233,9 @@ public abstract class World implements IBlockAccess {
          int k = i * 16 + 8 - blockposition.getX();
          int l = j * 16 + 8 - blockposition.getZ();
          boolean flag = true;
@@ -65,7 +65,7 @@ index 5cb0eba..8202800 100644
              for (int j = -short1; j <= short1; j += 16) {
                  for (int k = -short1; k <= short1; k += 16) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index d1385af..d822cb1 100644
+index 3d688d1..4315653 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1261,8 +1261,9 @@ public class CraftWorld implements World {
@@ -81,5 +81,5 @@ index d1385af..d822cb1 100644
                      loadChunk(chunkCoordX + x, chunkCoordZ + z);
                  } else {
 -- 
-2.8.3
+2.8.3.windows.1
 
diff --git a/Spigot-Server-Patches/0122-Don-t-spam-reload-spawn-chunks-in-nether-end.patch b/Spigot-Server-Patches/0122-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
index 66bbeb99b..b286d2d20 100644
--- a/Spigot-Server-Patches/0122-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
+++ b/Spigot-Server-Patches/0122-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
@@ -1,14 +1,14 @@
-From d22c6a2dd2c465ba21c98275618ff17fc428a581 Mon Sep 17 00:00:00 2001
+From 8470cf64eaf8b15d2aa5de3abc471015652dfc41 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Apr 2016 19:42:22 -0400
 Subject: [PATCH] Don't spam reload spawn chunks in nether/end
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 4cba507..8cfefeb 100644
+index facbdad..e25b864 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -3228,6 +3228,7 @@ public abstract class World implements IBlockAccess {
+@@ -3229,6 +3229,7 @@ public abstract class World implements IBlockAccess {
          return this.N;
      }
  
@@ -31,5 +31,5 @@ index e30d346..d1b2d15 100644
      }
  }
 -- 
-2.8.3
+2.8.3.windows.1
 
diff --git a/Spigot-Server-Patches/0124-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0124-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index b86f5a2f5..96c534114 100644
--- a/Spigot-Server-Patches/0124-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/Spigot-Server-Patches/0124-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
@@ -1,4 +1,4 @@
-From b9d946883334d9b53970db4afd8f087b3aa44fac Mon Sep 17 00:00:00 2001
+From 73022cc55788f18264c82e5558f7ad190f398c0c Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 6 Apr 2016 01:04:23 -0500
 Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names
@@ -19,10 +19,10 @@ index d6fef83..35364c7 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 8c6233d..9d595dc 100644
+index 06c4f12..2538cc5 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1343,7 +1343,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1346,7 +1346,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                      return;
                  }
  
@@ -39,5 +39,5 @@ index 8c6233d..9d595dc 100644
                  if (((LazyPlayerSet) event.getRecipients()).isLazy()) {
                      for (Object recipient : minecraftServer.getPlayerList().players) {
 -- 
-2.8.3
+2.8.3.windows.1
 
diff --git a/Spigot-Server-Patches/0127-Remove-unused-World-Tile-Entity-List.patch b/Spigot-Server-Patches/0127-Remove-unused-World-Tile-Entity-List.patch
index 8eb6b3c0f..58c1f10dc 100644
--- a/Spigot-Server-Patches/0127-Remove-unused-World-Tile-Entity-List.patch
+++ b/Spigot-Server-Patches/0127-Remove-unused-World-Tile-Entity-List.patch
@@ -1,4 +1,4 @@
-From 118f813c12dae34d97203e879c08726020c61739 Mon Sep 17 00:00:00 2001
+From 0593878dd3cee051ef50c1cc39526da11a267db8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 00:25:28 -0400
 Subject: [PATCH] Remove unused World Tile Entity List
@@ -6,7 +6,7 @@ Subject: [PATCH] Remove unused World Tile Entity List
 Massive hit to performance and it is completely unnecessary.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 8cfefeb..f15178a 100644
+index e25b864..b3165eb 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -69,7 +69,7 @@ public abstract class World implements IBlockAccess {
@@ -18,7 +18,7 @@ index 8cfefeb..f15178a 100644
      public final List<TileEntity> tileEntityListTick = Lists.newArrayList();
      private final List<TileEntity> b = Lists.newArrayList();
      private final Set<TileEntity> tileEntityListUnload = Sets.newHashSet(); // Paper
-@@ -1557,7 +1557,7 @@ public abstract class World implements IBlockAccess {
+@@ -1558,7 +1558,7 @@ public abstract class World implements IBlockAccess {
          // CraftBukkit start - From below, clean up tile entities before ticking them
          if (!this.tileEntityListUnload.isEmpty()) {
              this.tileEntityListTick.removeAll(this.tileEntityListUnload);
@@ -27,7 +27,7 @@ index 8cfefeb..f15178a 100644
              this.tileEntityListUnload.clear();
          }
          // CraftBukkit end
-@@ -1608,7 +1608,7 @@ public abstract class World implements IBlockAccess {
+@@ -1609,7 +1609,7 @@ public abstract class World implements IBlockAccess {
              if (tileentity.x()) {
                  tilesThisCycle--;
                  this.tileEntityListTick.remove(tileTickPosition--);
@@ -36,7 +36,7 @@ index 8cfefeb..f15178a 100644
                  if (this.isLoaded(tileentity.getPosition())) {
                      this.getChunkAtWorldCoords(tileentity.getPosition()).d(tileentity.getPosition());
                  }
-@@ -1646,7 +1646,7 @@ public abstract class World implements IBlockAccess {
+@@ -1647,7 +1647,7 @@ public abstract class World implements IBlockAccess {
                          this.notify(tileentity1.getPosition(), iblockdata, iblockdata, 3);
                          // CraftBukkit start
                          // From above, don't screw this up - SPIGOT-1746
@@ -45,7 +45,7 @@ index 8cfefeb..f15178a 100644
                              this.a(tileentity1);
                          }
                          // CraftBukkit end
-@@ -1666,9 +1666,9 @@ public abstract class World implements IBlockAccess {
+@@ -1667,9 +1667,9 @@ public abstract class World implements IBlockAccess {
      protected void l() {}
  
      public boolean a(TileEntity tileentity) {
@@ -57,7 +57,7 @@ index 8cfefeb..f15178a 100644
              this.tileEntityListTick.add(tileentity);
          }
  
-@@ -2138,7 +2138,7 @@ public abstract class World implements IBlockAccess {
+@@ -2139,7 +2139,7 @@ public abstract class World implements IBlockAccess {
          } else {
              if (tileentity != null) {
                  this.b.remove(tileentity);
@@ -67,5 +67,5 @@ index 8cfefeb..f15178a 100644
              }
  
 -- 
-2.8.3
+2.8.3.windows.1
 
diff --git a/Spigot-Server-Patches/0160-Re-add-tileEntityTick.startTiming-Spigot-removed.patch b/Spigot-Server-Patches/0160-Re-add-tileEntityTick.startTiming-Spigot-removed.patch
index 775685a09..f96bbdebf 100644
--- a/Spigot-Server-Patches/0160-Re-add-tileEntityTick.startTiming-Spigot-removed.patch
+++ b/Spigot-Server-Patches/0160-Re-add-tileEntityTick.startTiming-Spigot-removed.patch
@@ -1,11 +1,11 @@
-From 97887d847a6c09b29387a3cb9c71ecfcfc9497b8 Mon Sep 17 00:00:00 2001
+From cb654874d86e9cd0215054ea3014255a7d37907c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 27 May 2016 22:06:35 -0400
 Subject: [PATCH] Re-add tileEntityTick.startTiming Spigot removed
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 8d99b83..9f4b823 100644
+index 38a3692..3d80107 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1554,6 +1554,7 @@ public abstract class World implements IBlockAccess {
@@ -14,8 +14,8 @@ index 8d99b83..9f4b823 100644
          this.methodProfiler.c("blockEntities");
 +        timings.tileEntityTick.startTiming(); // Paper - Missed Timing start from Spigot
          this.M = true;
+         timings.tileEntityTick.startTiming(); // Spigot
          // CraftBukkit start - From below, clean up tile entities before ticking them
-         if (!this.tileEntityListUnload.isEmpty()) {
 -- 
-2.8.3
+2.8.3.windows.1
 
diff --git a/work/CraftBukkit b/work/CraftBukkit
index fb568fdc7..02f4218da 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit fb568fdc70321e6325a057868bf65d1ebcba1596
+Subproject commit 02f4218da5186d0f7e627fa958e311dd0d7e8c42
diff --git a/work/Spigot b/work/Spigot
index 3ccadba36..e50d38c38 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 3ccadba36a71e973ca556ee22bc9e147bacbda12
+Subproject commit e50d38c3872fb5067789a02dcecc5092dca1f681