Rebuild patches for updates.

CraftBukkit-Patches/0004-Obfuscation-Helpers.patch

@@ -1,4 +1,4 @@
-From 66a4f410c044c124e0f1cd31a53d6808f05d1dff Mon Sep 17 00:00:00 2001
+From 14b000ffaedc98dd7a8b50a6b629d10a4f9d3afb Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 14 Apr 2014 10:38:04 +1000
 Subject: [PATCH] Obfuscation Helpers
@@ -6,10 +6,10 @@ Subject: [PATCH] Obfuscation Helpers
 Provides several friendly named methods which map to a obfuscated method. Obfuscated methods which are used frequently should be added to this file to ease with updates to new Minecraft versions.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 7b2bedb..4941eed 100644
+index c7e8914..6199d30 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1290,6 +1290,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -1286,6 +1286,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
  
      }
  

CraftBukkit-Patches/0008-Merge-tweaks-and-configuration.patch

@@ -1,4 +1,4 @@
-From 5f945d18735c2588742a9ee996276be54f8dd76e Mon Sep 17 00:00:00 2001
+From 69f41b5a824a8cd70b667f338cf00712a4e56ca8 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 09:46:33 +1100
 Subject: [PATCH] Merge tweaks and configuration
@@ -6,7 +6,7 @@ Subject: [PATCH] Merge tweaks and configuration
 This allows the merging of Experience orbs, as well as the configuration of the merge radius of items. Additionally it refactors the merge algorithm to be a better experience for players.
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 6243b0e..c1b904d 100644
+index 1eda0ef..8b7cd86 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -122,7 +122,10 @@ public class EntityItem extends Entity {
@@ -21,16 +21,18 @@ index 6243b0e..c1b904d 100644
  
          while (iterator.hasNext()) {
              EntityItem entityitem = (EntityItem) iterator.next();
-@@ -156,11 +159,13 @@ public class EntityItem extends Entity {
+@@ -156,12 +159,14 @@ public class EntityItem extends Entity {
                      } else if (itemstack1.count + itemstack.count > itemstack1.getMaxStackSize()) {
                          return false;
                      } else {
+-                        if (org.bukkit.craftbukkit.event.CraftEventFactory.callItemMergeEvent(this, entityitem).isCancelled()) return false; // CraftBukkit
 -                        itemstack1.count += itemstack.count;
 -                        entityitem.pickupDelay = Math.max(entityitem.pickupDelay, this.pickupDelay);
 -                        entityitem.age = Math.min(entityitem.age, this.age);
 -                        entityitem.setItemStack(itemstack1);
 -                        this.die();
 +                        // Spigot start
++                        if (org.bukkit.craftbukkit.event.CraftEventFactory.callItemMergeEvent(entityitem, this).isCancelled()) return false; // CraftBukkit
 +                        itemstack.count += itemstack1.count;
 +                        this.pickupDelay = Math.max(entityitem.pickupDelay, this.pickupDelay);
 +                        this.age = Math.min(entityitem.age, this.age);
@@ -41,7 +43,7 @@ index 6243b0e..c1b904d 100644
                      }
                  } else {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 11e072b..df4d9cd 100644
+index 5cb66a5..75d335f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -970,6 +970,23 @@ public abstract class World implements IBlockAccess {

CraftBukkit-Patches/0011-Spigot-Timings.patch

@@ -1,4 +1,4 @@
-From a88c31aaedf181cd24f119991ee777ffebc767da Mon Sep 17 00:00:00 2001
+From 82977578e7ce6e67ae64b20888134749e0aead7c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 10 Jan 2013 00:18:11 -0500
 Subject: [PATCH] Spigot Timings
@@ -106,7 +106,7 @@ index cfd28f1..ad989e6 100644
          // return chunk; // CraftBukkit
      }
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index f23f5ba..c03110d 100644
+index 1e94b6d..d2d1818 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -20,6 +20,7 @@ import java.io.PrintStream;
@@ -242,18 +242,18 @@ index 8125cb9..6ef9c83 100644
  
          this.world.methodProfiler.b();
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 35a6dee..387e75b 100644
+index 6199d30..a58ac4b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -46,6 +46,7 @@ import joptsimple.OptionSet;
+@@ -45,6 +45,7 @@ import jline.console.ConsoleReader;
+ import joptsimple.OptionSet;
  
  import org.bukkit.craftbukkit.Main;
- import org.bukkit.World.Environment;
 +import org.bukkit.craftbukkit.SpigotTimings; // Spigot
- import org.bukkit.craftbukkit.util.Waitable;
+ // CraftBukkit end
- import org.bukkit.event.server.RemoteServerCommandEvent;
+ 
- import org.bukkit.event.world.WorldSaveEvent;
+ public abstract class MinecraftServer implements Runnable, ICommandListener, IAsyncTaskHandler, IMojangStatistics {
-@@ -619,6 +620,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -615,6 +616,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
      protected void z() {}
  
      protected void A() throws ExceptionWorldConflict { // CraftBukkit - added throws
@@ -261,7 +261,7 @@ index 35a6dee..387e75b 100644
          long i = System.nanoTime();
  
          ++this.ticks;
-@@ -645,10 +647,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -641,10 +643,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
          }
  
          if (autosavePeriod > 0 && this.ticks % autosavePeriod == 0) { // CraftBukkit
@@ -274,7 +274,7 @@ index 35a6dee..387e75b 100644
          }
  
          this.methodProfiler.a("tallying");
-@@ -665,6 +669,8 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -661,6 +665,8 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
  
          this.methodProfiler.b();
          this.methodProfiler.b();
@@ -283,7 +283,7 @@ index 35a6dee..387e75b 100644
      }
  
      public void B() {
-@@ -679,16 +685,23 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -675,16 +681,23 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
  
          this.methodProfiler.c("levels");
  
@@ -307,7 +307,7 @@ index 35a6dee..387e75b 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) {
-@@ -696,6 +709,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -692,6 +705,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
              }
          }
@@ -315,7 +315,7 @@ index 35a6dee..387e75b 100644
  
          int i;
  
-@@ -719,7 +733,9 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -715,7 +729,9 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
                  CrashReport crashreport;
  
                  try {
@@ -325,7 +325,7 @@ index 35a6dee..387e75b 100644
                  } catch (Throwable throwable) {
                      crashreport = CrashReport.a(throwable, "Exception ticking world");
                      worldserver.a(crashreport);
-@@ -727,7 +743,9 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -723,7 +739,9 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
                  }
  
                  try {
@@ -335,7 +335,7 @@ index 35a6dee..387e75b 100644
                  } catch (Throwable throwable1) {
                      crashreport = CrashReport.a(throwable1, "Exception ticking world entities");
                      worldserver.a(crashreport);
-@@ -736,7 +754,9 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -732,7 +750,9 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
  
                  this.methodProfiler.b();
                  this.methodProfiler.a("tracker");
@@ -345,7 +345,7 @@ index 35a6dee..387e75b 100644
                  this.methodProfiler.b();
                  this.methodProfiler.b();
              // } // CraftBukkit
-@@ -745,14 +765,20 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -741,14 +761,20 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
          }
  
          this.methodProfiler.c("connection");
@@ -419,7 +419,7 @@ index 513712d..b8d0961 100644
      private static Map<String, Class<? extends TileEntity>> f = Maps.newHashMap();
      private static 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 68f4996..45cafe7 100644
+index 61db17c..e34964f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -21,6 +21,7 @@ import org.bukkit.Bukkit;
@@ -599,7 +599,7 @@ index 37c403d..396c034 100644
  
      public Spigot spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 18f4f21..41daf0a 100644
+index 07d1ee4..fc2a1ab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -257,9 +257,11 @@ public class CraftWorld implements World {

CraftBukkit-Patches/0037-Fully-Disable-Snooper-When-Not-Required.patch

@@ -1,14 +1,14 @@
-From 164ba15fd875a5e3baf333a5952f6688add05a6a Mon Sep 17 00:00:00 2001
+From 1d1be9d558b3803373a4904f734158a013362656 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 fe61577..42a2bea 100644
+index a58ac4b..ed66d5e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -659,11 +659,11 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -655,11 +655,11 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
          this.h[this.ticks % 100] = System.nanoTime() - i;
          this.methodProfiler.b();
          this.methodProfiler.a("snooper");

CraftBukkit-Patches/0048-Watchdog-Thread.patch

@@ -1,11 +1,11 @@
-From e3b830054346481eeebfb9171869901b42a0897e Mon Sep 17 00:00:00 2001
+From ec5de67e61a8b00e25a06fec87285bf3de72205b 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 22d51aa..7f7ec42 100644
+index d2d1818..077bf16 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 22d51aa..7f7ec42 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 42a2bea..054a269 100644
+index ed66d5e..6cef666 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -569,6 +569,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -565,6 +565,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
              this.a(crashreport);
          } finally {
              try {
@@ -29,7 +29,7 @@ index 42a2bea..054a269 100644
                  this.isStopped = true;
                  this.stop();
              } catch (Throwable throwable1) {
-@@ -669,6 +670,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -665,6 +666,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
  
          this.methodProfiler.b();
          this.methodProfiler.b();
@@ -314,5 +314,5 @@ index 0000000..de08ad6
 +    }
 +}
 -- 
-1.9.0.msysgit.0
+2.1.4
 

CraftBukkit-Patches/0057-Configurable-Amount-of-Netty-Threads.patch

@@ -1,4 +1,4 @@
-From 1e99fd9f92d823170985e919accc98265d5d082c Mon Sep 17 00:00:00 2001
+From 81a1e441ce14ac8c364b3dffd44eb282f6c07ede 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,10 +6,10 @@ 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 054a269..b3d89c1 100644
+index 6cef666..4cb8a1e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -63,7 +63,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -59,7 +59,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
      private final List<IUpdatePlayerListBox> p = Lists.newArrayList();
      protected final ICommandHandler b;
      public final MethodProfiler methodProfiler = new MethodProfiler();
@@ -18,7 +18,7 @@ index 054a269..b3d89c1 100644
      private final ServerPing r = new ServerPing();
      private final Random s = new Random();
      private String serverIp;
-@@ -125,7 +125,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -121,7 +121,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
          this.e = proxy;
          MinecraftServer.l = this;
          // this.universe = file; // CraftBukkit
@@ -27,7 +27,7 @@ index 054a269..b3d89c1 100644
          this.Z = new UserCache(this, file1);
          this.b = this.h();
          // this.convertable = new WorldLoaderServer(file); // CraftBukkit - moved to DedicatedServer.init
-@@ -1325,7 +1325,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -1321,7 +1321,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
      }
      // Spigot End
      public ServerConnection aq() {
@@ -53,5 +53,5 @@ index 824ba7a..a306266 100644
 +    }
  }
 -- 
-1.9.0.msysgit.0
+2.1.4
 

CraftBukkit-Patches/0059-Log-Cause-of-Unexpected-Exceptions.patch

@@ -1,14 +1,14 @@
-From fc49ad64d8ae0dc5e4dfc2c5a00541dcb17431dc Mon Sep 17 00:00:00 2001
+From 3da26d7355a20ec9e1dec359433c47337cafc779 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 b3d89c1..ab9bb09 100644
+index 4cb8a1e..56126c4 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -550,6 +550,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -546,6 +546,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
              }
          } catch (Throwable throwable) {
              MinecraftServer.LOGGER.error("Encountered an unexpected exception", throwable);

CraftBukkit-Patches/0069-Try-and-Debug-Crash-Reports-Crashing.patch

@@ -1,14 +1,14 @@
-From cdbd805f597fc3d83bbe2f17e0a86e370a5977cf Mon Sep 17 00:00:00 2001
+From d12a162d9e7495788ece80532898447a4939cc52 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 ab9bb09..43ef181 100644
+index 56126c4..1244fbf 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -745,7 +745,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -741,7 +741,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
                      worldserver.doTick();
                      worldserver.timings.doTick.stopTiming(); // Spigot
                  } catch (Throwable throwable) {
@@ -22,7 +22,7 @@ index ab9bb09..43ef181 100644
                      worldserver.a(crashreport);
                      throw new ReportedException(crashreport);
                  }
-@@ -755,7 +761,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -751,7 +757,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
                      worldserver.tickEntities();
                      worldserver.timings.tickEntities.stopTiming(); // Spigot
                  } catch (Throwable throwable1) {

CraftBukkit-Patches/0070-Improve-AutoSave-Mechanism.patch

@@ -1,4 +1,4 @@
-From e69f1b13d3763a1b35faa94230b8a11dd5434b1f Mon Sep 17 00:00:00 2001
+From 39097e7eef729fb5a6c9aa9d52b16ddb3ced4008 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 0645e6b..c59f441 100644
+index 1244fbf..95b4d0f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -657,7 +657,17 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -653,7 +653,17 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
              SpigotTimings.worldSaveTimer.startTiming(); // Spigot
              this.methodProfiler.a("save");
              this.v.savePlayers();

CraftBukkit-Patches/0073-Highly-Optimized-Tick-Loop.patch

@@ -1,14 +1,14 @@
-From 30ce706a8813d7c9c7c7afa090e92b67f0463fe0 Mon Sep 17 00:00:00 2001
+From 79f6602fc1e00d6a50529f986b5b4a0ff003aaf7 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 48371bc..5ae016a 100644
+index 95b4d0f..58d68cd 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -120,6 +120,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -116,6 +116,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
      public java.util.Queue<Runnable> processQueue = new java.util.concurrent.ConcurrentLinkedQueue<Runnable>();
      public int autosavePeriod;
      // CraftBukkit end
@@ -21,7 +21,7 @@ index 48371bc..5ae016a 100644
  
      public MinecraftServer(OptionSet options, Proxy proxy, File file1) {
          this.e = proxy;
-@@ -503,6 +509,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -499,6 +505,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
          this.isRunning = false;
      }
  
@@ -35,7 +35,7 @@ index 48371bc..5ae016a 100644
      public void run() {
          try {
              if (this.init()) {
-@@ -513,38 +526,34 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -509,38 +522,34 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
                  this.r.setServerInfo(new ServerPing.ServerData("1.8.7", 47));
                  this.a(this.r);
  

CraftBukkit-Patches/0095-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch

@@ -1,4 +1,4 @@
-From d2a36ea752f95c598cbf22c415461d2c8c019cba Mon Sep 17 00:00:00 2001
+From e355c8a6cdc2a295d65da6496be37368cece2f46 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 b61af44..9af5a07 100644
+index 58d68cd..08efc91 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1017,7 +1017,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -1013,7 +1013,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
      }
  
      public String getServerModName() {

CraftBukkit-Patches/0118-Configurable-save-on-stop-only-for-UserCache.patch

@@ -1,14 +1,14 @@
-From 433f59925459c87ae5711d9a064ac3b7a17e8965 Mon Sep 17 00:00:00 2001
+From a0abacdfc37269d8eb814ba87c6e22a51cefaed9 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 9af5a07..a951bc9 100644
+index 08efc91..5230d6d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -489,7 +489,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -485,7 +485,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
              if (this.n.d()) {
                  this.n.e();
              }
@@ -24,7 +24,7 @@ index 9af5a07..a951bc9 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
-index 31b4e81..72154d4 100644
+index 8001b8a..4450ea3 100644
 --- a/src/main/java/net/minecraft/server/UserCache.java
 +++ b/src/main/java/net/minecraft/server/UserCache.java
 @@ -149,7 +149,7 @@ public class UserCache {

CraftBukkit-Patches/0120-Add-damager-to-the-unhandled-error.patch

@@ -1,11 +1,11 @@
-From 8d2e6642d47cb5e8aea7ff40fdfbb03698b9a07a Mon Sep 17 00:00:00 2001
+From 8a4ba154eff9e7d5c1a7f867209628a5189db97a 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 c5eca56..211c421 100644
+index 260c305..c1085a0 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 {
@@ -17,7 +17,7 @@ index c5eca56..211c421 100644
          }
          return callPlayerInteractEvent(who, action, new BlockPosition(0, 256, 0), EnumDirection.SOUTH, itemstack);
      }
-@@ -469,7 +469,7 @@ public class CraftEventFactory {
+@@ -482,7 +482,7 @@ public class CraftEventFactory {
              if (source == DamageSource.CACTUS) {
                  cause = DamageCause.CONTACT;
              } else {
@@ -26,7 +26,7 @@ index c5eca56..211c421 100644
              }
              EntityDamageEvent event = callEvent(new EntityDamageByBlockEvent(damager, entity.getBukkitEntity(), cause, modifiers, modifierFunctions));
              if (!event.isCancelled()) {
-@@ -487,7 +487,7 @@ public class CraftEventFactory {
+@@ -500,7 +500,7 @@ public class CraftEventFactory {
              } else if (source == DamageSource.FALL) {
                  cause = DamageCause.FALL;
              } else {
@@ -35,7 +35,7 @@ index c5eca56..211c421 100644
              }
              EntityDamageEvent event = callEvent(new EntityDamageByEntityEvent(damager, entity.getBukkitEntity(), cause, modifiers, modifierFunctions));
              if (!event.isCancelled()) {
-@@ -525,7 +525,7 @@ public class CraftEventFactory {
+@@ -538,7 +538,7 @@ public class CraftEventFactory {
              return callEntityDamageEvent(null, entity, cause, modifiers, modifierFunctions);
          }
  

CraftBukkit-Patches/0125-Disable-ResourceLeakDetector.patch

@@ -1,4 +1,4 @@
-From 53c1dc26f89eaf98fdc232bedc546731db54a673 Mon Sep 17 00:00:00 2001
+From 0204f73852ced34f302253b85bceb6b81d88f6ae Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 8 Jul 2014 09:01:50 +1000
 Subject: [PATCH] Disable ResourceLeakDetector
@@ -6,10 +6,10 @@ Subject: [PATCH] Disable ResourceLeakDetector
 Hopefully no plugins are somehow leaking buffers, but disabling the ResourceLeakDetector is a good thing for performance of the Netty IO subsytem (it's been disabled in BungeeCord for a while now).
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a951bc9..8b95e59 100644
+index 5230d6d..2621f37 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -128,6 +128,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -124,6 +124,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
      // Spigot end
  
      public MinecraftServer(OptionSet options, Proxy proxy, File file1) {

CraftBukkit-Patches/0154-Use-CLQ-for-main-thread-tasks.patch

@@ -1,14 +1,14 @@
-From 6e013773c3bd27469674a2fc4b9d57b438e5f523 Mon Sep 17 00:00:00 2001
+From 2801e27256bb859f88d4ee6ee982c9f576f45639 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 8b95e59..811dcf1 100644
+index 2621f37..bc98e1f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -104,7 +104,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -100,7 +100,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
      private long X = 0L;
      private final GameProfileRepository Y;
      private final UserCache Z;
@@ -17,7 +17,7 @@ index 8b95e59..811dcf1 100644
      private Thread serverThread;
      private long ab = az();
  
-@@ -711,11 +711,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -707,11 +707,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
          this.methodProfiler.a("jobs");
          Queue queue = this.j;
  
@@ -36,7 +36,7 @@ index 8b95e59..811dcf1 100644
  
          this.methodProfiler.c("levels");
  
-@@ -1499,10 +1501,10 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
+@@ -1495,10 +1497,10 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
              ListenableFutureTask listenablefuturetask = ListenableFutureTask.create(callable);
              Queue queue = this.j;