Upstream merge

CraftBukkit-Patches/0004-Obfuscation-Helpers.patch

@@ -1,4 +1,4 @@
-From 6181b9fe69fce239f2b0407f0ee379715a388f3f Mon Sep 17 00:00:00 2001
+From b7647efbfb6a2923097068467dfa29e860b87979 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 ff1b38a..392b895 100644
+index 4bd0c85..0a707eb 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1298,6 +1298,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
+@@ -1309,6 +1309,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
  
      }
  

CraftBukkit-Patches/0010-Async-Operation-Catching.patch

@@ -1,4 +1,4 @@
-From 8d555f255d398001002608e6c2217f2fa3fdde66 Mon Sep 17 00:00:00 2001
+From f615ece064e48e491d294e02c47c898f1ca27562 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 25 Mar 2014 16:10:01 +1100
 Subject: [PATCH] Async Operation Catching
@@ -26,17 +26,17 @@ index 12e2b79..9a19752 100644
      public int a(Random random) {
          return 1;
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 0d76a99..d2a0954 100644
+index e0bde4a..778bcd3 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -549,6 +549,7 @@ public abstract class EntityLiving extends Entity {
+@@ -565,6 +565,7 @@ public abstract class EntityLiving extends Entity {
      }
  
      public void addEffect(MobEffect mobeffect) {
 +        org.spigotmc.AsyncCatcher.catchOp( "effect add"); // Spigot
-         if (this.d(mobeffect)) {
+         // CraftBukkit start
-             if (this.effects.containsKey(Integer.valueOf(mobeffect.getEffectId()))) {
+         if (isTickingEffects) {
-                 ((MobEffect) this.effects.get(Integer.valueOf(mobeffect.getEffectId()))).a(mobeffect);
+             effectsToProcess.add(mobeffect);
 diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
 index c9058db..350f2f7 100644
 --- a/src/main/java/net/minecraft/server/EntityTracker.java

CraftBukkit-Patches/0012-Spigot-Timings.patch

@@ -1,4 +1,4 @@
-From 29c05c2c47f5a655cf0e5aa4131ca33c891ec256 Mon Sep 17 00:00:00 2001
+From 9c31172b45c1c00ff904edb1e55d87327c1b041f 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
@@ -171,10 +171,10 @@ index ccf6479..c699dd1 100644
  
      private void recalcPosition() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index d2a0954..71e1e6e 100644
+index 778bcd3..cd56586 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -20,6 +20,8 @@ import org.bukkit.event.entity.EntityRegainHealthEvent;
+@@ -21,6 +21,8 @@ import org.bukkit.event.entity.EntityRegainHealthEvent;
  import org.bukkit.event.vehicle.VehicleExitEvent;
  // CraftBukkit end
  
@@ -183,7 +183,7 @@ index d2a0954..71e1e6e 100644
  public abstract class EntityLiving extends Entity {
  
      private static final UUID a = UUID.fromString("662A6B8D-DA3E-4C1C-8813-96EA6097278D");
-@@ -1397,6 +1399,7 @@ public abstract class EntityLiving extends Entity {
+@@ -1425,6 +1427,7 @@ public abstract class EntityLiving extends Entity {
      }
  
      public void s_() {
@@ -191,7 +191,7 @@ index d2a0954..71e1e6e 100644
          super.s_();
          if (!this.world.isStatic) {
              int i = this.bu();
-@@ -1435,7 +1438,9 @@ public abstract class EntityLiving extends Entity {
+@@ -1463,7 +1466,9 @@ public abstract class EntityLiving extends Entity {
              }
          }
  
@@ -201,7 +201,7 @@ index d2a0954..71e1e6e 100644
          double d0 = this.locX - this.lastX;
          double d1 = this.locZ - this.lastZ;
          float f = (float) (d0 * d0 + d1 * d1);
-@@ -1500,6 +1505,7 @@ public abstract class EntityLiving extends Entity {
+@@ -1528,6 +1533,7 @@ public abstract class EntityLiving extends Entity {
  
          this.world.methodProfiler.b();
          this.aR += f2;
@@ -209,7 +209,7 @@ index d2a0954..71e1e6e 100644
      }
  
      protected float h(float f, float f1) {
-@@ -1564,6 +1570,7 @@ public abstract class EntityLiving extends Entity {
+@@ -1592,6 +1598,7 @@ public abstract class EntityLiving extends Entity {
          }
  
          this.world.methodProfiler.a("ai");
@@ -217,7 +217,7 @@ index d2a0954..71e1e6e 100644
          if (this.bC()) {
              this.aW = false;
              this.aX = 0.0F;
-@@ -1574,6 +1581,7 @@ public abstract class EntityLiving extends Entity {
+@@ -1602,6 +1609,7 @@ public abstract class EntityLiving extends Entity {
              this.doTick();
              this.world.methodProfiler.b();
          }
@@ -225,7 +225,7 @@ index d2a0954..71e1e6e 100644
  
          this.world.methodProfiler.b();
          this.world.methodProfiler.a("jump");
-@@ -1595,11 +1603,15 @@ public abstract class EntityLiving extends Entity {
+@@ -1623,11 +1631,15 @@ public abstract class EntityLiving extends Entity {
          this.aX *= 0.98F;
          this.aY *= 0.98F;
          this.aZ *= 0.9F;
@@ -242,7 +242,7 @@ index d2a0954..71e1e6e 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 392b895..072559e 100644
+index 0a707eb..76591fb 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -45,6 +45,7 @@ import joptsimple.OptionSet;
@@ -253,7 +253,7 @@ index 392b895..072559e 100644
  import org.bukkit.craftbukkit.util.Waitable;
  import org.bukkit.event.server.RemoteServerCommandEvent;
  import org.bukkit.event.world.WorldSaveEvent;
-@@ -585,6 +586,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
+@@ -596,6 +597,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
      protected void x() {}
  
      protected void y() throws ExceptionWorldConflict { // CraftBukkit - added throws
@@ -261,7 +261,7 @@ index 392b895..072559e 100644
          long i = System.nanoTime();
  
          ++this.ticks;
-@@ -611,10 +613,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
+@@ -622,10 +624,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
          }
  
          if (autosavePeriod > 0 && this.ticks % autosavePeriod == 0) { // CraftBukkit
@@ -274,7 +274,7 @@ index 392b895..072559e 100644
          }
  
          this.methodProfiler.a("tallying");
-@@ -631,6 +635,8 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
+@@ -642,6 +646,8 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
  
          this.methodProfiler.b();
          this.methodProfiler.b();
@@ -283,7 +283,7 @@ index 392b895..072559e 100644
      }
  
      public void z() {
-@@ -653,16 +659,23 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
+@@ -664,16 +670,23 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
  
          this.methodProfiler.c("levels");
  
@@ -307,7 +307,7 @@ index 392b895..072559e 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) {
-@@ -670,6 +683,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
+@@ -681,6 +694,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, 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 392b895..072559e 100644
  
          int i;
  
-@@ -693,7 +707,9 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
+@@ -704,7 +718,9 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
                  CrashReport crashreport;
  
                  try {
@@ -325,7 +325,7 @@ index 392b895..072559e 100644
                  } catch (Throwable throwable1) {
                      crashreport = CrashReport.a(throwable1, "Exception ticking world");
                      worldserver.a(crashreport);
-@@ -701,7 +717,9 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
+@@ -712,7 +728,9 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
                  }
  
                  try {
@@ -335,7 +335,7 @@ index 392b895..072559e 100644
                  } catch (Throwable throwable2) {
                      crashreport = CrashReport.a(throwable2, "Exception ticking world entities");
                      worldserver.a(crashreport);
-@@ -710,7 +728,9 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
+@@ -721,7 +739,9 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
  
                  this.methodProfiler.b();
                  this.methodProfiler.a("tracker");
@@ -345,7 +345,7 @@ index 392b895..072559e 100644
                  this.methodProfiler.b();
                  this.methodProfiler.b();
              // } // CraftBukkit
-@@ -719,14 +739,20 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
+@@ -730,14 +750,20 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
          }
  
          this.methodProfiler.c("connection");

CraftBukkit-Patches/0015-Entity-Activation-Range.patch

@@ -1,4 +1,4 @@
-From aaba206943acc0564bd4e4d406771a381836b411 Mon Sep 17 00:00:00 2001
+From 1cd015cd6dce28ba5e49b8b63ab5e45daff273e3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Feb 2013 05:10:21 -0500
 Subject: [PATCH] Entity Activation Range
@@ -145,10 +145,10 @@ index 8357157..16400c3 100644
          super(world);
          this.a(0.25F, 0.25F);
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 71e1e6e..1530f18 100644
+index cd56586..89374d7 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -86,6 +86,13 @@ public abstract class EntityLiving extends Entity {
+@@ -87,6 +87,13 @@ public abstract class EntityLiving extends Entity {
      public int maxAirTicks = 300;
      ArrayList<org.bukkit.inventory.ItemStack> drops = null;
      // CraftBukkit end

CraftBukkit-Patches/0037-Player-Collision-API.patch

@@ -1,4 +1,4 @@
-From 3037321cf7de8d37558eac71f49126224b543e5c Mon Sep 17 00:00:00 2001
+From 9b4ea23bbc9967695d8490365b88cf42534b8d01 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 3 Aug 2013 19:27:07 +1000
 Subject: [PATCH] Player Collision API
@@ -25,10 +25,10 @@ index 7eb41e1..b65c225 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 1530f18..ece05ff 100644
+index 89374d7..5edefa0 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -1629,7 +1629,7 @@ public abstract class EntityLiving extends Entity {
+@@ -1657,7 +1657,7 @@ public abstract class EntityLiving extends Entity {
      protected void bK() {
          List list = this.world.getEntities(this, this.getBoundingBox().grow(0.20000000298023224D, 0.0D, 0.20000000298023224D));
  

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

@@ -1,14 +1,14 @@
-From 6dad6b155c7465d4e5827159be63e406adc7e2ed Mon Sep 17 00:00:00 2001
+From 62b4df74ba22d9183d040fb81d2c4311dc4de7a0 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 49429d7..0619584 100644
+index 76591fb..6ba24ac 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -625,11 +625,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
+@@ -636,11 +636,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
          this.g[this.ticks % 100] = System.nanoTime() - i;
          this.methodProfiler.b();
          this.methodProfiler.a("snooper");

CraftBukkit-Patches/0049-Watchdog-Thread.patch

@@ -1,4 +1,4 @@
-From b1a40798e24f77ea7ba865a0443fbc5acac3ab3f Mon Sep 17 00:00:00 2001
+From a66be45a291cd95a83d9d282c6415f07da78682f 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.
@@ -18,10 +18,10 @@ index 390c6eb..240c909 100644
  
                      thread.setName("Server Watchdog");
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0619584..2fa1626 100644
+index 6ba24ac..84f27a3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -535,6 +535,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
+@@ -546,6 +546,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
              this.a(crashreport);
          } finally {
              try {
@@ -29,7 +29,7 @@ index 0619584..2fa1626 100644
                  this.stop();
                  this.isStopped = true;
              } catch (Throwable throwable1) {
-@@ -635,6 +636,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
+@@ -646,6 +647,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
  
          this.methodProfiler.b();
          this.methodProfiler.b();
@@ -39,7 +39,7 @@ index 0619584..2fa1626 100644
      }
 diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
 new file mode 100644
-index 0000000..429c258
+index 0000000..429c2580
 --- /dev/null
 +++ b/src/main/java/org/spigotmc/RestartCommand.java
 @@ -0,0 +1,124 @@

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

@@ -1,4 +1,4 @@
-From 8c7e514a2e848e8965c974934bfbf5d96d9012f0 Mon Sep 17 00:00:00 2001
+From 22ddc6be5182ad00421ce5993c1c244996363a03 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 9cdb2fb..e54a72b 100644
+index 84f27a3..6ff18f0 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -61,7 +61,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -27,7 +27,7 @@ index 9cdb2fb..e54a72b 100644
          this.Z = new UserCache(this, file1);
          this.p = this.h();
          // this.convertable = new WorldLoaderServer(file); // CraftBukkit - moved to DedicatedServer.init
-@@ -1333,7 +1333,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
+@@ -1344,7 +1344,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
      }
      // Spigot End
      public ServerConnection ao() {

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

@@ -1,14 +1,14 @@
-From a3f6547f56e3974fee1d1b114bec876156815576 Mon Sep 17 00:00:00 2001
+From beb3013c5304eb153520c74d54705747a376374a 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 abef561..a8bab04 100644
+index 6ff18f0..85b4bf9 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -516,6 +516,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
+@@ -527,6 +527,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
              }
          } catch (Throwable throwable) {
              MinecraftServer.LOGGER.error("Encountered an unexpected exception", throwable);

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

@@ -1,14 +1,14 @@
-From 6c4c7dafa44b36d83dbdf021021ebff2e6474434 Mon Sep 17 00:00:00 2001
+From 489e85227ca259087ed35f62069cdda5f9d096f4 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 520434e..131b872 100644
+index 85b4bf9..0ee0c21 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -719,7 +719,13 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
+@@ -730,7 +730,13 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
                      worldserver.doTick();
                      worldserver.timings.doTick.stopTiming(); // Spigot
                  } catch (Throwable throwable1) {
@@ -22,7 +22,7 @@ index 520434e..131b872 100644
                      worldserver.a(crashreport);
                      throw new ReportedException(crashreport);
                  }
-@@ -729,7 +735,13 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
+@@ -740,7 +746,13 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
                      worldserver.tickEntities();
                      worldserver.timings.tickEntities.stopTiming(); // Spigot
                  } catch (Throwable throwable2) {

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

@@ -1,4 +1,4 @@
-From 6f14392ef8bc8666ccf12636c7ba9bba7068ab19 Mon Sep 17 00:00:00 2001
+From cd3da7aec9a483428048439ad92f4eb66335656c 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
@@ -24,10 +24,10 @@ index 372d90f..c0e2a50 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 7ce37c0..4a2f084 100644
+index 0ee0c21..bc0c405 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -623,7 +623,17 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
+@@ -634,7 +634,17 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
              SpigotTimings.worldSaveTimer.startTiming(); // Spigot
              this.methodProfiler.a("save");
              this.v.savePlayers();
@@ -47,7 +47,7 @@ index 7ce37c0..4a2f084 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 a57136c..5ec836d 100644
+index 204acdb..660fd07 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -718,12 +718,17 @@ public class CraftWorld implements World {

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

@@ -1,11 +1,11 @@
-From 2621a358d3a0459663d4ac9ef8d863f9a44809b8 Mon Sep 17 00:00:00 2001
+From 92e4039d128bdbd6dc57c3558ae0529572bffedc 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 4a2f084..d213ae4 100644
+index bc0c405..34fb946 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -118,6 +118,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -21,7 +21,7 @@ index 4a2f084..d213ae4 100644
  
      public MinecraftServer(OptionSet options, Proxy proxy, File file1) {
          this.d = proxy;
-@@ -469,6 +475,13 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
+@@ -480,6 +486,13 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
          this.isRunning = false;
      }
  
@@ -35,7 +35,7 @@ index 4a2f084..d213ae4 100644
      public void run() {
          try {
              if (this.init()) {
-@@ -479,38 +492,34 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
+@@ -490,38 +503,34 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
                  this.r.setServerInfo(new ServerPingServerData("1.8", 47));
                  this.a(this.r);
  

CraftBukkit-Patches/0080-Cap-Entity-Collisions.patch

@@ -1,4 +1,4 @@
-From 153b505b0c565ec8e15bb719d8f74c4eadbfedd2 Mon Sep 17 00:00:00 2001
+From 6212c84b5bf5cb873f5a5b73f222247fba6428ae Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 31 Jan 2014 11:18:34 -0500
 Subject: [PATCH] Cap Entity Collisions
@@ -19,10 +19,10 @@ index a1d51a8..25192f3 100644
          if (entity.passenger != this && entity.vehicle != this) {
              if (!entity.T && !this.T) {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index ece05ff..bcdf820 100644
+index 5edefa0..7c8f361 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -1630,7 +1630,9 @@ public abstract class EntityLiving extends Entity {
+@@ -1658,7 +1658,9 @@ public abstract class EntityLiving extends Entity {
          List list = this.world.getEntities(this, this.getBoundingBox().grow(0.20000000298023224D, 0.0D, 0.20000000298023224D));
  
          if (this.ad() && list != null && !list.isEmpty()) { // Spigot: Add this.ad() condition
@@ -32,7 +32,7 @@ index ece05ff..bcdf820 100644
                  Entity entity = (Entity) list.get(i);
                  
                  // TODO better check now?
-@@ -1641,9 +1643,12 @@ public abstract class EntityLiving extends Entity {
+@@ -1669,9 +1671,12 @@ public abstract class EntityLiving extends Entity {
                  // CraftBukkit end
  
                  if (entity.ae()) {
@@ -46,7 +46,7 @@ index ece05ff..bcdf820 100644
  
      }
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 93ab1c1..71f772c 100644
+index c7cb20c..76ded26 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -273,4 +273,11 @@ public class SpigotWorldConfig

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

@@ -1,4 +1,4 @@
-From 1cbaf47c2abbfbe4f6d78e513b9fe641d290ddf8 Mon Sep 17 00:00:00 2001
+From 9e89dc77f0df34ee69e4e75078b5a909b7a69d4c 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 b72c4e2..52dd494 100644
+index 34fb946..ff98d02 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1042,7 +1042,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
+@@ -1053,7 +1053,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
      }
  
      public String getServerModName() {

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

@@ -1,14 +1,14 @@
-From 9e74277f311ad7c694448ed3505a92f6770917b2 Mon Sep 17 00:00:00 2001
+From 2f998bb403bc087c0cbffa26e22757e269b8d482 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 8521259..f13be48 100644
+index ff98d02..5f417c1 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -455,7 +455,13 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
+@@ -466,7 +466,13 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
              if (this.m.d()) {
                  this.m.e();
              }

CraftBukkit-Patches/0134-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch

@@ -1,4 +1,4 @@
-From 257a0378e77c4c2f6ba5d0b84829cd3d7c2a152b Mon Sep 17 00:00:00 2001
+From fec5fa2e2d432db3dcb93c19a39c6b0b41c1eeb1 Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Thu, 17 Jul 2014 21:13:15 -0400
 Subject: [PATCH] Fix for enchanting table wiping meta when placing stacked
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix for enchanting table wiping meta when placing stacked
 
 
 diff --git a/src/main/java/net/minecraft/server/ContainerEnchantTable.java b/src/main/java/net/minecraft/server/ContainerEnchantTable.java
-index 51cee69..ef8d05c 100644
+index eb02821..e223e71 100644
 --- a/src/main/java/net/minecraft/server/ContainerEnchantTable.java
 +++ b/src/main/java/net/minecraft/server/ContainerEnchantTable.java
-@@ -311,7 +311,11 @@ public class ContainerEnchantTable extends Container {
+@@ -316,7 +316,11 @@ public class ContainerEnchantTable extends Container {
                      ((Slot) this.c.get(0)).set(itemstack1.cloneItemStack());
                      itemstack1.count = 0;
                  } else if (itemstack1.count >= 1) {