diff --git a/CraftBukkit-Patches/0018-Entity-Tracking-Ranges.patch b/CraftBukkit-Patches/0018-Entity-Tracking-Ranges.patch
index 1a56537..d5f2c6d 100644
--- a/CraftBukkit-Patches/0018-Entity-Tracking-Ranges.patch
+++ b/CraftBukkit-Patches/0018-Entity-Tracking-Ranges.patch
@@ -1,4 +1,4 @@
-From 98c2490b9e0db5dbcaf154bdc8d2bcba1676a2ff Mon Sep 17 00:00:00 2001
+From 9af363974598c5f5b89a7ca2c88232b2941b5330 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Feb 2013 11:58:47 -0500
 Subject: [PATCH] Entity Tracking Ranges
@@ -24,10 +24,10 @@ index e1ff4f0..cb72b36 100644
              i = this.e;
          }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index d3f4af1..0143623 100644
+index 3da76ff..ccf6d93 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
-@@ -106,7 +106,7 @@ public class ActivationRange
+@@ -108,7 +108,7 @@ public class ActivationRange
          maxRange = Math.max( maxRange, miscActivationRange );
          maxRange = Math.min( ( world.spigotConfig.viewDistance << 4 ) - 8, maxRange );
  
@@ -36,7 +36,7 @@ index d3f4af1..0143623 100644
          {
  
              player.activatedTick = MinecraftServer.currentTick;
-@@ -188,7 +188,7 @@ public class ActivationRange
+@@ -190,7 +190,7 @@ public class ActivationRange
      public static boolean checkEntityImmunities(Entity entity)
      {
          // quick checks.
@@ -45,7 +45,7 @@ index d3f4af1..0143623 100644
          {
              return true;
          }
-@@ -215,14 +215,14 @@ public class ActivationRange
+@@ -217,14 +217,14 @@ public class ActivationRange
              {
                  return true;
              }
diff --git a/CraftBukkit-Patches/0025-Implement-SpawnerSpawnEvent.patch b/CraftBukkit-Patches/0025-Implement-SpawnerSpawnEvent.patch
index 76d75b1..fee0af1 100644
--- a/CraftBukkit-Patches/0025-Implement-SpawnerSpawnEvent.patch
+++ b/CraftBukkit-Patches/0025-Implement-SpawnerSpawnEvent.patch
@@ -1,4 +1,4 @@
-From c376a82c02fe22df003b586879846358da93a822 Mon Sep 17 00:00:00 2001
+From 69d3535e743af676c4b77b3f2af1781062ae1216 Mon Sep 17 00:00:00 2001
 From: Andy Shulman <andy.shulman@hotmail.com>
 Date: Mon, 15 Apr 2013 20:06:37 -0500
 Subject: [PATCH] Implement SpawnerSpawnEvent.
@@ -64,7 +64,7 @@ index 7b10821..35ed213 100644
  
          return entity;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 2a01005..260c305 100644
+index f0d3f75..2771b28 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -18,6 +18,7 @@ import org.bukkit.Statistic.Type;
@@ -75,7 +75,7 @@ index 2a01005..260c305 100644
  import org.bukkit.craftbukkit.CraftServer;
  import org.bukkit.craftbukkit.CraftStatistic;
  import org.bukkit.craftbukkit.CraftWorld;
-@@ -128,6 +129,22 @@ public class CraftEventFactory {
+@@ -129,6 +130,22 @@ public class CraftEventFactory {
      }
  
      /**
diff --git a/CraftBukkit-Patches/0037-Fully-Disable-Snooper-When-Not-Required.patch b/CraftBukkit-Patches/0037-Fully-Disable-Snooper-When-Not-Required.patch
index 2c3544b..9c90511 100644
--- a/CraftBukkit-Patches/0037-Fully-Disable-Snooper-When-Not-Required.patch
+++ b/CraftBukkit-Patches/0037-Fully-Disable-Snooper-When-Not-Required.patch
@@ -1,14 +1,14 @@
-From e0262af8cd97118d7f5d5cbfd4f8d3b0ca28d2e7 Mon Sep 17 00:00:00 2001
+From fd42204f5757b7af9451bdc9dcf68d7eafa22901 Mon Sep 17 00:00:00 2001
 From: agentk20 <agentkid20@gmail.com>
 Date: Sat, 3 Aug 2013 19:28:48 +1000
 Subject: [PATCH] Fully Disable Snooper When Not Required
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e42c0ba..05b0b52 100644
+index 5d1aa0b..2acf3bd 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -655,11 +655,11 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -656,11 +656,11 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
          this.h[this.ticks % 100] = System.nanoTime() - i;
          this.methodProfiler.b();
          this.methodProfiler.a("snooper");
diff --git a/CraftBukkit-Patches/0038-Add-Getter-for-Entity-Invulnerability.patch b/CraftBukkit-Patches/0038-Add-Getter-for-Entity-Invulnerability.patch
index 209f730..dc384bc 100644
--- a/CraftBukkit-Patches/0038-Add-Getter-for-Entity-Invulnerability.patch
+++ b/CraftBukkit-Patches/0038-Add-Getter-for-Entity-Invulnerability.patch
@@ -1,14 +1,14 @@
-From af0d91f09d43929fbb2cc2e49892dd1065decb39 Mon Sep 17 00:00:00 2001
+From e5bb74a1c2832936bc46cb42915f39abebc51a94 Mon Sep 17 00:00:00 2001
 From: DerFlash <bte@freenet.de>
 Date: Sat, 3 Aug 2013 19:53:48 +1000
 Subject: [PATCH] Add Getter for Entity Invulnerability
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 93193ac..89cbb45 100644
+index 4c0ac67..0234fe3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -541,6 +541,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -542,6 +542,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      // Spigot start
      private final Spigot spigot = new Spigot()
      {
diff --git a/CraftBukkit-Patches/0048-Watchdog-Thread.patch b/CraftBukkit-Patches/0048-Watchdog-Thread.patch
index d29542f..c977fb0 100644
--- a/CraftBukkit-Patches/0048-Watchdog-Thread.patch
+++ b/CraftBukkit-Patches/0048-Watchdog-Thread.patch
@@ -1,11 +1,11 @@
-From 1bbdb0f376abecacc9b129c2b2bf1f0a5f4bbb4b Mon Sep 17 00:00:00 2001
+From d80a8985f88927ef527f5959f32ec1d2c47ab765 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 5 Aug 2014 17:20:19 +0100
 Subject: [PATCH] Watchdog Thread.
 
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 14d2207..be30d17 100644
+index da295f3..113049a 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -270,7 +270,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -18,10 +18,10 @@ index 14d2207..be30d17 100644
  
                      thread1.setName("Server Watchdog");
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 05b0b52..98d6bce 100644
+index 2acf3bd..d5f58f1 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -565,6 +565,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -566,6 +566,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
              this.a(crashreport);
          } finally {
              try {
@@ -29,7 +29,7 @@ index 05b0b52..98d6bce 100644
                  this.isStopped = true;
                  this.stop();
              } catch (Throwable throwable1) {
-@@ -665,6 +666,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -666,6 +667,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
  
          this.methodProfiler.b();
          this.methodProfiler.b();
diff --git a/CraftBukkit-Patches/0057-Configurable-Amount-of-Netty-Threads.patch b/CraftBukkit-Patches/0057-Configurable-Amount-of-Netty-Threads.patch
index dcf3a73..1aba4ee 100644
--- a/CraftBukkit-Patches/0057-Configurable-Amount-of-Netty-Threads.patch
+++ b/CraftBukkit-Patches/0057-Configurable-Amount-of-Netty-Threads.patch
@@ -1,4 +1,4 @@
-From efe6e588fa24862c1fcf38c0c9e696aa3f66b5f0 Mon Sep 17 00:00:00 2001
+From 8d59cbbb21000192b238c74addd28a4a625cf65e Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 13 Dec 2013 11:58:58 +1100
 Subject: [PATCH] Configurable Amount of Netty Threads
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Amount of Netty Threads
 This brings back the option that the Spigot version of netty saw. By default Netty will try and use cores*2 threads, however if running multiple servers on the same machine, this can be too many threads. Additionally some people have 16 core servers. If 32 Netty threads are allowed in this setup, then the lock contention, and thus blocking between threads becomes much greater, leading to decreased performance.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 98d6bce..5c7c0d0 100644
+index d5f58f1..cdf7e0a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -59,7 +59,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -27,7 +27,7 @@ index 98d6bce..5c7c0d0 100644
          this.Z = new UserCache(this, file1);
          this.b = this.h();
          // this.convertable = new WorldLoaderServer(file); // CraftBukkit - moved to DedicatedServer.init
-@@ -1321,7 +1321,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -1322,7 +1322,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
      }
      // Spigot End
      public ServerConnection aq() {
diff --git a/CraftBukkit-Patches/0059-Log-Cause-of-Unexpected-Exceptions.patch b/CraftBukkit-Patches/0059-Log-Cause-of-Unexpected-Exceptions.patch
index 14894ba..01cdd40 100644
--- a/CraftBukkit-Patches/0059-Log-Cause-of-Unexpected-Exceptions.patch
+++ b/CraftBukkit-Patches/0059-Log-Cause-of-Unexpected-Exceptions.patch
@@ -1,14 +1,14 @@
-From 2719f638dc995d03e1da40d1977ce0da149edfed Mon Sep 17 00:00:00 2001
+From 6a7da9b465c656b8c77602d8180a707c5e3349c6 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 18 Dec 2013 13:39:14 +1100
 Subject: [PATCH] Log Cause of Unexpected Exceptions
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5c7c0d0..f95d560 100644
+index cdf7e0a..0637df9 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -546,6 +546,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -547,6 +547,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
              }
          } catch (Throwable throwable) {
              MinecraftServer.LOGGER.error("Encountered an unexpected exception", throwable);
diff --git a/CraftBukkit-Patches/0069-Try-and-Debug-Crash-Reports-Crashing.patch b/CraftBukkit-Patches/0069-Try-and-Debug-Crash-Reports-Crashing.patch
index 402fc57..8a97c77 100644
--- a/CraftBukkit-Patches/0069-Try-and-Debug-Crash-Reports-Crashing.patch
+++ b/CraftBukkit-Patches/0069-Try-and-Debug-Crash-Reports-Crashing.patch
@@ -1,14 +1,14 @@
-From d3396a903f9a160ece92f486114d6101e3896f4b Mon Sep 17 00:00:00 2001
+From bf215730a200db2cd4d457d58b1d310e72174209 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 12 Jan 2014 20:56:41 +1100
 Subject: [PATCH] Try and Debug Crash Reports Crashing
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f95d560..e552226 100644
+index 0637df9..db360fb 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -741,7 +741,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -742,7 +742,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
                      worldserver.doTick();
                      worldserver.timings.doTick.stopTiming(); // Spigot
                  } catch (Throwable throwable) {
@@ -22,7 +22,7 @@ index f95d560..e552226 100644
                      worldserver.a(crashreport);
                      throw new ReportedException(crashreport);
                  }
-@@ -751,7 +757,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -752,7 +758,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
                      worldserver.tickEntities();
                      worldserver.timings.tickEntities.stopTiming(); // Spigot
                  } catch (Throwable throwable1) {
diff --git a/CraftBukkit-Patches/0070-Improve-AutoSave-Mechanism.patch b/CraftBukkit-Patches/0070-Improve-AutoSave-Mechanism.patch
index 651e7d1..c1cbf80 100644
--- a/CraftBukkit-Patches/0070-Improve-AutoSave-Mechanism.patch
+++ b/CraftBukkit-Patches/0070-Improve-AutoSave-Mechanism.patch
@@ -1,4 +1,4 @@
-From a67e84acd959b485012eb3a9fe5c757792e0521d Mon Sep 17 00:00:00 2001
+From 5d9662a42d3dfafe3ee455e83fdfc8cd6530d9f4 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 12 Jan 2014 21:07:18 +1100
 Subject: [PATCH] Improve AutoSave Mechanism
@@ -37,10 +37,10 @@ index af77eef..975d666 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e552226..a4beaf8 100644
+index db360fb..b7ba79a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -653,7 +653,17 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -654,7 +654,17 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
              SpigotTimings.worldSaveTimer.startTiming(); // Spigot
              this.methodProfiler.a("save");
              this.v.savePlayers();
@@ -60,7 +60,7 @@ index e552226..a4beaf8 100644
              SpigotTimings.worldSaveTimer.stopTiming(); // Spigot
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 20e2416..0629805 100644
+index e0d2bfb..70912d6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -740,12 +740,17 @@ public class CraftWorld implements World {
diff --git a/CraftBukkit-Patches/0073-Highly-Optimized-Tick-Loop.patch b/CraftBukkit-Patches/0073-Highly-Optimized-Tick-Loop.patch
index 1991799..779498b 100644
--- a/CraftBukkit-Patches/0073-Highly-Optimized-Tick-Loop.patch
+++ b/CraftBukkit-Patches/0073-Highly-Optimized-Tick-Loop.patch
@@ -1,11 +1,11 @@
-From ec2e702a67ab0ae83a7687c64b8f63d731d63850 Mon Sep 17 00:00:00 2001
+From 338b4ea12bc2426248489fe26a9b2c7bac6feb30 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 25 Jan 2014 14:08:35 +1100
 Subject: [PATCH] Highly Optimized Tick Loop
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a4beaf8..6c39107 100644
+index b7ba79a..c55dcae 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -116,6 +116,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -21,7 +21,7 @@ index a4beaf8..6c39107 100644
  
      public MinecraftServer(OptionSet options, Proxy proxy, File file1) {
          this.e = proxy;
-@@ -499,6 +505,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -500,6 +506,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
          this.isRunning = false;
      }
  
@@ -35,7 +35,7 @@ index a4beaf8..6c39107 100644
      public void run() {
          try {
              if (this.init()) {
-@@ -509,38 +522,34 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -510,38 +523,34 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
                  this.r.setServerInfo(new ServerPing.ServerData("1.8.8", 47));
                  this.a(this.r);
  
diff --git a/CraftBukkit-Patches/0074-Configurable-Ping-Sample-Size.patch b/CraftBukkit-Patches/0074-Configurable-Ping-Sample-Size.patch
index 76a095a..961f28e 100644
--- a/CraftBukkit-Patches/0074-Configurable-Ping-Sample-Size.patch
+++ b/CraftBukkit-Patches/0074-Configurable-Ping-Sample-Size.patch
@@ -1,14 +1,14 @@
-From e2674c80cf48aa226b0817717c7463a3fa7e4c19 Mon Sep 17 00:00:00 2001
+From 80bf07aee22def1f8d8e1ad947c6a7ee496b10b7 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 26 Jan 2014 21:48:34 +1100
 Subject: [PATCH] Configurable Ping Sample Size
 
 
 diff --git a/src/main/java/net/minecraft/server/PacketStatusListener.java b/src/main/java/net/minecraft/server/PacketStatusListener.java
-index 7a16569..a5feb31 100644
+index 5b1abb4..e4bff04 100644
 --- a/src/main/java/net/minecraft/server/PacketStatusListener.java
 +++ b/src/main/java/net/minecraft/server/PacketStatusListener.java
-@@ -115,6 +115,13 @@ public class PacketStatusListener implements PacketStatusInListener {
+@@ -108,6 +108,13 @@ public class PacketStatusListener implements PacketStatusInListener {
          }
  
          ServerPing.ServerPingPlayerSample playerSample = new ServerPing.ServerPingPlayerSample(event.getMaxPlayers(), profiles.size());
diff --git a/CraftBukkit-Patches/0095-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch b/CraftBukkit-Patches/0095-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch
index 42e0669..5352df5 100644
--- a/CraftBukkit-Patches/0095-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch
+++ b/CraftBukkit-Patches/0095-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch
@@ -1,4 +1,4 @@
-From 2b6851eb13bdd6af07cd3633790cc729869f2995 Mon Sep 17 00:00:00 2001
+From 993f29b10ba5812bf849113ddbbe89798ae57700 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Fri, 11 Apr 2014 11:16:34 +0100
 Subject: [PATCH] Display 'Spigot' in client crashes, server lists and Mojang
@@ -6,10 +6,10 @@ Subject: [PATCH] Display 'Spigot' in client crashes, server lists and Mojang
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6c39107..a8fe417 100644
+index c55dcae..304c577 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1013,7 +1013,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -1014,7 +1014,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
      }
  
      public String getServerModName() {
diff --git a/CraftBukkit-Patches/0118-Configurable-save-on-stop-only-for-UserCache.patch b/CraftBukkit-Patches/0118-Configurable-save-on-stop-only-for-UserCache.patch
index 8ccbddc..5ed77cb 100644
--- a/CraftBukkit-Patches/0118-Configurable-save-on-stop-only-for-UserCache.patch
+++ b/CraftBukkit-Patches/0118-Configurable-save-on-stop-only-for-UserCache.patch
@@ -1,14 +1,14 @@
-From f8d2ebece4cbfea47c0508af16e7319fad0feeba Mon Sep 17 00:00:00 2001
+From 96ff9e63f0291a26a96316c101de1063843f28a7 Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Fri, 23 May 2014 18:05:10 -0400
 Subject: [PATCH] Configurable save-on-stop-only for UserCache
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a8fe417..1e6e401 100644
+index 304c577..81d7ea3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -485,7 +485,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -486,7 +486,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
              if (this.n.d()) {
                  this.n.e();
              }
diff --git a/CraftBukkit-Patches/0120-Add-damager-to-the-unhandled-error.patch b/CraftBukkit-Patches/0120-Add-damager-to-the-unhandled-error.patch
index 6cabb9f..c9fec94 100644
--- a/CraftBukkit-Patches/0120-Add-damager-to-the-unhandled-error.patch
+++ b/CraftBukkit-Patches/0120-Add-damager-to-the-unhandled-error.patch
@@ -1,14 +1,14 @@
-From 956e8682b2cb78cd680675829030f6e3c8cc1bf7 Mon Sep 17 00:00:00 2001
+From 5ddc1687efc584a5696a66ff4524e7d2c8b8c813 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Thu, 26 Jun 2014 23:42:52 +0100
 Subject: [PATCH] Add damager to the unhandled error
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 260c305..c1085a0 100644
+index 2771b28..147b928 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -185,7 +185,7 @@ public class CraftEventFactory {
+@@ -186,7 +186,7 @@ public class CraftEventFactory {
       */
      public static PlayerInteractEvent callPlayerInteractEvent(EntityHuman who, Action action, ItemStack itemstack) {
          if (action != Action.LEFT_CLICK_AIR && action != Action.RIGHT_CLICK_AIR) {
@@ -17,7 +17,7 @@ index 260c305..c1085a0 100644
          }
          return callPlayerInteractEvent(who, action, new BlockPosition(0, 256, 0), EnumDirection.SOUTH, itemstack);
      }
-@@ -482,7 +482,7 @@ public class CraftEventFactory {
+@@ -483,7 +483,7 @@ public class CraftEventFactory {
              if (source == DamageSource.CACTUS) {
                  cause = DamageCause.CONTACT;
              } else {
@@ -26,7 +26,7 @@ index 260c305..c1085a0 100644
              }
              EntityDamageEvent event = callEvent(new EntityDamageByBlockEvent(damager, entity.getBukkitEntity(), cause, modifiers, modifierFunctions));
              if (!event.isCancelled()) {
-@@ -500,7 +500,7 @@ public class CraftEventFactory {
+@@ -501,7 +501,7 @@ public class CraftEventFactory {
              } else if (source == DamageSource.FALL) {
                  cause = DamageCause.FALL;
              } else {
@@ -35,7 +35,7 @@ index 260c305..c1085a0 100644
              }
              EntityDamageEvent event = callEvent(new EntityDamageByEntityEvent(damager, entity.getBukkitEntity(), cause, modifiers, modifierFunctions));
              if (!event.isCancelled()) {
-@@ -538,7 +538,7 @@ public class CraftEventFactory {
+@@ -539,7 +539,7 @@ public class CraftEventFactory {
              return callEntityDamageEvent(null, entity, cause, modifiers, modifierFunctions);
          }
  
diff --git a/CraftBukkit-Patches/0121-Cross-World-Entity-Teleportation.patch b/CraftBukkit-Patches/0121-Cross-World-Entity-Teleportation.patch
index 65ca397..40f6866 100644
--- a/CraftBukkit-Patches/0121-Cross-World-Entity-Teleportation.patch
+++ b/CraftBukkit-Patches/0121-Cross-World-Entity-Teleportation.patch
@@ -1,4 +1,4 @@
-From 879e94cd8a3d63afc8defe693f08018b9a19f874 Mon Sep 17 00:00:00 2001
+From aaa2c88a63db57c293bbd1440827602c72d2b4cd Mon Sep 17 00:00:00 2001
 From: Andrew Krieger <Slizyboy@hotmail.com>
 Date: Tue, 24 Dec 2013 07:55:23 -0800
 Subject: [PATCH] Cross World Entity Teleportation
@@ -6,10 +6,10 @@ Subject: [PATCH] Cross World Entity Teleportation
 Use Entity.teleportTo for cross-world teleportation in CraftEntity.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 89cbb45..725870a 100644
+index 0234fe3..efbf1a8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -232,7 +232,14 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -234,7 +234,14 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          // If this entity is riding another entity, we must dismount before teleporting.
          entity.mount(null);
  
diff --git a/CraftBukkit-Patches/0151-Use-Standard-List-for-EntitySlices.patch b/CraftBukkit-Patches/0151-Use-Standard-List-for-EntitySlices.patch
index 8b6f966..f9d5c94 100644
--- a/CraftBukkit-Patches/0151-Use-Standard-List-for-EntitySlices.patch
+++ b/CraftBukkit-Patches/0151-Use-Standard-List-for-EntitySlices.patch
@@ -1,4 +1,4 @@
-From 907b96bf524d11d1d93ac400cd6968ce15acaa3b Mon Sep 17 00:00:00 2001
+From 15f5ebb6c66c7d1096a2fc1c9b518487e4fd090b Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 20 Feb 2015 21:33:36 +1100
 Subject: [PATCH] Use Standard List for EntitySlices.
@@ -59,10 +59,10 @@ index 994903f..022ba31 100644
      }
  
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 0143623..621a717 100644
+index ccf6d93..d8d54bd 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
-@@ -141,9 +141,9 @@ public class ActivationRange
+@@ -143,9 +143,9 @@ public class ActivationRange
       */
      private static void activateChunkEntities(Chunk chunk)
      {
diff --git a/CraftBukkit-Patches/0152-Allow-Capping-Tile-Entity-Tick-Time.patch b/CraftBukkit-Patches/0152-Allow-Capping-Tile-Entity-Tick-Time.patch
index a7cbde5..39285ec 100644
--- a/CraftBukkit-Patches/0152-Allow-Capping-Tile-Entity-Tick-Time.patch
+++ b/CraftBukkit-Patches/0152-Allow-Capping-Tile-Entity-Tick-Time.patch
@@ -1,4 +1,4 @@
-From f72e5ec9cfe8c8581e12ba456e8f43b914111775 Mon Sep 17 00:00:00 2001
+From 45a637328912612c12a4558770581b495ed6fe04 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 20 Feb 2015 21:39:31 +1100
 Subject: [PATCH] Allow Capping (Tile)Entity Tick Time.
@@ -10,7 +10,7 @@ For tiles there is very little tradeoff for this option, as tile ticks are based
 This feature was commisioned by Chunkr.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 60fa9ca..0271b19 100644
+index 60fa9ca..eca86db 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -137,6 +137,9 @@ public abstract class World implements IBlockAccess {
@@ -40,7 +40,7 @@ index 60fa9ca..0271b19 100644
 +        int entitiesThisCycle = 0;
 +        if (tickPosition < 0) tickPosition = 0;
 +        for (entityLimiter.initTick();
-+                entitiesThisCycle < entityList.size() && (entitiesThisCycle % 10 == 0 || entityLimiter.shouldContinue());
++                entitiesThisCycle < entityList.size() && (entitiesThisCycle % 10 != 0 || entityLimiter.shouldContinue());
 +                tickPosition++, entitiesThisCycle++) {
 +            tickPosition = (tickPosition < entityList.size()) ? tickPosition : 0;
              entity = (Entity) this.entityList.get(this.tickPosition);
@@ -57,7 +57,7 @@ index 60fa9ca..0271b19 100644
 +        // Spigot start
 +        int tilesThisCycle = 0;
 +        for (tileLimiter.initTick();
-+                tilesThisCycle < tileEntityList.size() && (tilesThisCycle % 10 == 0 || tileLimiter.shouldContinue());
++                tilesThisCycle < tileEntityList.size() && (tilesThisCycle % 10 != 0 || tileLimiter.shouldContinue());
 +                tileTickPosition++, tilesThisCycle++) {
 +            tileTickPosition = (tileTickPosition < tileEntityList.size()) ? tileTickPosition : 0;
 +            TileEntity tileentity = (TileEntity) this.tileEntityList.get(tileTickPosition);
diff --git a/CraftBukkit-Patches/0154-Use-CLQ-for-main-thread-tasks.patch b/CraftBukkit-Patches/0154-Use-CLQ-for-main-thread-tasks.patch
index 36cf1d3..15fc228 100644
--- a/CraftBukkit-Patches/0154-Use-CLQ-for-main-thread-tasks.patch
+++ b/CraftBukkit-Patches/0154-Use-CLQ-for-main-thread-tasks.patch
@@ -1,11 +1,11 @@
-From fef3370f99356cf082547e89ddee6f6cf81e876f Mon Sep 17 00:00:00 2001
+From 4b4dbc75c3c618e917893695727b995edbc32dac Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 19 Apr 2015 09:19:39 +1000
 Subject: [PATCH] Use CLQ for main thread tasks.
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index dd3c740..2079772 100644
+index 9bf5415..1d29ae7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -100,7 +100,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -17,7 +17,7 @@ index dd3c740..2079772 100644
      private Thread serverThread;
      private long ab = az();
  
-@@ -707,11 +707,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -708,11 +708,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
          this.methodProfiler.a("jobs");
          Queue queue = this.j;
  
@@ -36,7 +36,7 @@ index dd3c740..2079772 100644
  
          this.methodProfiler.c("levels");
  
-@@ -1495,10 +1497,10 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -1496,10 +1498,10 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
              ListenableFutureTask listenablefuturetask = ListenableFutureTask.create(callable);
              Queue queue = this.j;