Update from upstream SpigotMC

Upstream merge (we must go deeper) SpigotMC/Spigot@1e7bc383c3

Bukkit

@@ -1 +1 @@
-Subproject commit 8d5b4c1e9acc499377da0d807e7ca2245d5c3bdf
+Subproject commit f210234e59275330f83b994e199c76f6abd41ee7

Bukkit-Patches/0015-Add-Getter-for-Entity-Invulnerability.patch

@@ -1,14 +1,14 @@
-From e0d91a1e2cb6199febbebaeefc31c3d65c7de491 Mon Sep 17 00:00:00 2001
+From a0050052a88535b6fa078ada0ee818aeb6906835 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 3 Aug 2013 19:49:36 +1000
 Subject: [PATCH] Add Getter for Entity Invulnerability
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 396ea20..294e80b 100644
+index a60172d..5a1e895 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -291,4 +291,22 @@ public interface Entity extends Metadatable {
+@@ -295,4 +295,22 @@ public interface Entity extends Metadatable {
       * @return The current vehicle.
       */
      public Entity getVehicle();

Bukkit-Patches/0028-Fix-slow-tab-complete-for-some-commands.patch

@@ -1,25 +1,12 @@
-From 1aa49f17b57768c68ddfe4be0a7ec9f86d0facbc Mon Sep 17 00:00:00 2001
+From 2ccaec690f2f7d6d47ed8d4a13206fd748ad7fef Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 22 Jul 2014 21:01:32 +1000
 Subject: [PATCH] Fix slow tab complete for some commands.
 
 Use online players instead of offline players, which is very slow.
 
-diff --git a/src/main/java/org/bukkit/command/defaults/DeopCommand.java b/src/main/java/org/bukkit/command/defaults/DeopCommand.java
-index 1b71d49..8a571e8 100644
---- a/src/main/java/org/bukkit/command/defaults/DeopCommand.java
-+++ b/src/main/java/org/bukkit/command/defaults/DeopCommand.java
-@@ -49,7 +49,7 @@ public class DeopCommand extends VanillaCommand {
- 
-         if (args.length == 1) {
-             List<String> completions = new ArrayList<String>();
--            for (OfflinePlayer player : Bukkit.getOfflinePlayers()) {
-+            for (OfflinePlayer player : Bukkit.getOnlinePlayers()) { // Spigot - offline players is slow
-                 String playerName = player.getName();
-                 if (player.isOp() && StringUtil.startsWithIgnoreCase(playerName, args[0])) {
-                     completions.add(playerName);
 diff --git a/src/main/java/org/bukkit/command/defaults/WhitelistCommand.java b/src/main/java/org/bukkit/command/defaults/WhitelistCommand.java
-index b3fa4f8..fd81ee3 100644
+index b3fa4f8..6559b33 100644
 --- a/src/main/java/org/bukkit/command/defaults/WhitelistCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/WhitelistCommand.java
 @@ -104,7 +104,7 @@ public class WhitelistCommand extends VanillaCommand {
@@ -27,7 +14,7 @@ index b3fa4f8..fd81ee3 100644
              if (args[0].equalsIgnoreCase("add")) {
                  List<String> completions = new ArrayList<String>();
 -                for (OfflinePlayer player : Bukkit.getOfflinePlayers()) {
-+                for (OfflinePlayer player : Bukkit.getOnlinePlayers()) { // Spigot - offline players is slow
++                for (OfflinePlayer player : Bukkit.getOnlinePlayers()) { // Spigot - well maybe sometimes you haven't turned the whitelist on just yet.
                      String name = player.getName();
                      if (StringUtil.startsWithIgnoreCase(name, args[1]) && !player.isWhitelisted()) {
                          completions.add(name);

CraftBukkit

@@ -1 +1 @@
-Subproject commit 0b2ed13a5d24fd9620f8b03c1bf888e3eccd715e
+Subproject commit 07d4558b48d0717cb7f9e07015c76599b9fe9697

CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch

@@ -1,4 +1,4 @@
-From b4a9a234fe82b8c7d7117ff6ba84daa5bb1c380b Mon Sep 17 00:00:00 2001
+From be8a0e8c5faf4bfda4034f4b9994e496d08cd159 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:10:56 +1000
 Subject: [PATCH] Skeleton API Implementations
@@ -45,10 +45,10 @@ index 4f8d47d..09e7223 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index fe0f200..e026c1f 100644
+index b8a9a14..4198dae 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -399,4 +399,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -402,4 +402,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
  
          return getHandle().vehicle.getBukkitEntity();
      }
@@ -65,10 +65,10 @@ index fe0f200..e026c1f 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 9760f8f..6493ce7 100644
+index bbf310b..da0c78e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1284,4 +1284,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1287,4 +1287,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
          collection.add(new AttributeModifiable(getHandle().getAttributeMap(), (new AttributeRanged("generic.maxHealth", scaledHealth ? healthScale : getMaxHealth(), 0.0D, Float.MAX_VALUE)).a("Max Health").a(true)));
      }

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

@@ -1,11 +1,11 @@
-From 7e036a2f853ca31801801c3661d75a74cfee38f3 Mon Sep 17 00:00:00 2001
+From 3b55fa44285c9acb3af6671c6897f8c12bc6ae56 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 54c77f8..4bde9c1 100644
+index a4e29b2..aeab36b 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -430,7 +430,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
@@ -31,7 +31,7 @@ index 92ad5c7..859e91f 100644
                  Entity entity = (Entity) list.get(i);
  
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index adfaddf..f74e175 100644
+index 84673b4..46aa10e 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -63,6 +63,21 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -57,10 +57,10 @@ index adfaddf..f74e175 100644
      public EntityPlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile, PlayerInteractManager playerinteractmanager) {
          super(worldserver, gameprofile);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8b599f2..ab1c5d8 100644
+index d02d728..62d237d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1289,6 +1289,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1292,6 +1292,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      // Spigot start
      private final Player.Spigot spigot = new Player.Spigot()
      {

CraftBukkit-Patches/0044-Add-Getter-for-Entity-Invulnerability.patch

@@ -1,14 +1,14 @@
-From 2f0abcc6f56027b1f74794e0fa359531ec185205 Mon Sep 17 00:00:00 2001
+From fc034066577293dc3625eea4017b0cd0c667c247 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 e026c1f..96d763b 100644
+index 4198dae..ce18aea 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -403,6 +403,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -406,6 +406,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      // Spigot start
      private final Spigot spigot = new Spigot()
      {

CraftBukkit-Patches/0045-Cap-Minimum-Player-Speed.patch

@@ -1,14 +1,14 @@
-From cc4c7dc555c07985d566dc1c85baadc309c8610e Mon Sep 17 00:00:00 2001
+From a52057bc770732b2466e87998df89545a9f22230 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Mon, 5 Aug 2013 20:17:20 +1000
 Subject: [PATCH] Cap Minimum Player Speed
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ab1c5d8..6241ada 100644
+index 62d237d..6ac6520 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1162,7 +1162,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1165,7 +1165,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void setFlySpeed(float value) {
          validateSpeed(value);
          EntityPlayer player = getHandle();
@@ -17,7 +17,7 @@ index ab1c5d8..6241ada 100644
          player.updateAbilities();
  
      }
-@@ -1170,7 +1170,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1173,7 +1173,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void setWalkSpeed(float value) {
          validateSpeed(value);
          EntityPlayer player = getHandle();

CraftBukkit-Patches/0051-Implement-respawn-API.patch

@@ -1,14 +1,14 @@
-From 7b9fb7f421b4298f153613e4f0f083b79b130e25 Mon Sep 17 00:00:00 2001
+From cf5885b4e85cef41dd80102a7b1c04301a88a47c Mon Sep 17 00:00:00 2001
 From: ninja- <xninja@openmailbox.org>
 Date: Tue, 8 Oct 2013 14:34:49 +0200
 Subject: [PATCH] Implement respawn API.
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6241ada..232df48 100644
+index 6ac6520..1a9c381 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1302,6 +1302,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1305,6 +1305,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              getHandle().collidesWithEntities = collides;
              getHandle().k = collides; // First boolean of Entity
          }

CraftBukkit-Patches/0059-Allow-Teleportation-of-Vehicles-and-Passengers.patch

@@ -1,40 +0,0 @@
-From a13d03bb5a250afe690b384d547dc1c2ad9b9ae8 Mon Sep 17 00:00:00 2001
-From: ItsHarry <info@itsjerryandharry.com>
-Date: Thu, 5 Dec 2013 21:58:11 +0100
-Subject: [PATCH] Allow Teleportation of Vehicles and Passengers
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 232df48..a77b2d9 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -459,9 +459,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-             return false;
-         }
- 
--        if (entity.vehicle != null || entity.passenger != null) {
--            return false;
--        }
-+        // Spigot Start
-+        // if (entity.vehicle != null || entity.passenger != null) {
-+        // return false;
-+        // }
-+        // Spigot End
- 
-         // From = Players current Location
-         Location from = this.getLocation();
-@@ -475,6 +477,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-         if (event.isCancelled()) {
-             return false;
-         }
-+        
-+        // Spigot Start
-+        eject();
-+        leaveVehicle();
-+        // Spigot End
- 
-         // Update the From Location
-         from = event.getFrom();
--- 
-1.9.1
-

CraftBukkit-Patches/0059-Remove-OS-X-Special-Chars-from-Signs.patch

@@ -1,11 +1,11 @@
-From 781e95ae6af11cc45899e75e764ec85a8705178c Mon Sep 17 00:00:00 2001
+From e31b577f7de0698aed56af04f4f2aff64d5c7e6a Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 8 Dec 2013 16:52:42 +1100
 Subject: [PATCH] Remove OS X Special Chars from Signs
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index f170ad0..1ee5541 100644
+index 234817a..c833842 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1584,6 +1584,7 @@ public class PlayerConnection implements PacketPlayInListener {

CraftBukkit-Patches/0060-Orebfuscator.patch

@@ -1,4 +1,4 @@
-From 935843a587ceb77ad93fe57a272c39f2d2dc029b Mon Sep 17 00:00:00 2001
+From 2e82b1fef397aabe97590cdff49286c377b8c3f1 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 16 May 2013 18:51:05 +1000
 Subject: [PATCH] Orebfuscator

CraftBukkit-Patches/0061-Optimize-DataWatcher.patch

@@ -1,4 +1,4 @@
-From 31ab17dc3535db331530e100849a91feba9608b9 Mon Sep 17 00:00:00 2001
+From fbb4966bee9ea69a36b3c5c33fc938022d126ee6 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 13 Dec 2013 11:45:47 +1100
 Subject: [PATCH] Optimize DataWatcher

CraftBukkit-Patches/0062-Fire-PreLogin-Events-in-Offline-Mode.patch

@@ -1,4 +1,4 @@
-From f48253e81390ceb92c9fa7adeeea091e3bc66a02 Mon Sep 17 00:00:00 2001
+From 8abafb671cbc9be3cbb51d2c14166edc869f4849 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 18 Dec 2013 13:32:10 +1100
 Subject: [PATCH] Fire PreLogin Events in Offline Mode

CraftBukkit-Patches/0063-BungeeCord-Support.patch

@@ -1,4 +1,4 @@
-From f778234f103f8b7c09941172f010f9c43a02c9ae Mon Sep 17 00:00:00 2001
+From 2e8ac3c3738d56396a9731bd6fba7cc258a515d5 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 1 Dec 2013 18:18:41 +1100
 Subject: [PATCH] BungeeCord Support
@@ -175,10 +175,10 @@ index f8e2f0f..5a08283 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a77b2d9..e030666 100644
+index 1a9c381..3eafd75 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1298,6 +1298,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1294,6 +1294,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      {
  
          @Override

CraftBukkit-Patches/0064-Allow-Disabling-Zombie-Villager-Aggression.patch

@@ -1,4 +1,4 @@
-From 09453b1bf6ee187b875d5e9970821b06374eb84d Mon Sep 17 00:00:00 2001
+From 0a97621b48c190c94dbd507785f483ac5346b3b9 Mon Sep 17 00:00:00 2001
 From: Dylan Xaldin <Puremin0rez515@gmail.com>
 Date: Thu, 12 Dec 2013 18:05:03 -0600
 Subject: [PATCH] Allow Disabling Zombie Villager Aggression

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

@@ -1,4 +1,4 @@
-From 6648f843706a4d60068bc8b689af566b401ef0ee Mon Sep 17 00:00:00 2001
+From b932d6b340a6a6a929e69f9b9cd6b5a0fc12d099 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 256d2f9..b0157b2 100644
+index d596924..38d7890 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -54,7 +54,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo

CraftBukkit-Patches/0066-Prevent-Mineshaft-Saving.patch

@@ -1,4 +1,4 @@
-From 89b7b6b5de036aeb7140204ef95288767c9b1a20 Mon Sep 17 00:00:00 2001
+From 24da9b64d2d522cff1e8dc331a9d31153837c7d7 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 13 Dec 2013 15:21:02 +1100
 Subject: [PATCH] Prevent Mineshaft Saving

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

@@ -1,11 +1,11 @@
-From 55448475919982a16da1ab626234f920ec1687cc Mon Sep 17 00:00:00 2001
+From c36c747624ea7d3089686e8f7a48ce1b862941d1 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 b0157b2..ee74b03 100644
+index 38d7890..6a31aaa 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -479,6 +479,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo

CraftBukkit-Patches/0068-Particle-API.patch

@@ -1,4 +1,4 @@
-From b3d80db144b04c9cfefed4610975d85afd7a4193 Mon Sep 17 00:00:00 2001
+From 6961a86266ba0a25e5331b9e1f9bcc4bdef39f46 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Fri, 20 Dec 2013 21:36:06 +0000
 Subject: [PATCH] Particle API
@@ -117,10 +117,10 @@ index 28aa997..53a5d37 100644
  
      public Spigot spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e030666..c8787cf 100644
+index 3eafd75..6960a29 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1324,6 +1324,49 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1320,6 +1320,49 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
                  server.getServer().getPlayerList().moveToWorld( getHandle(), 0, false );
              }
          }

CraftBukkit-Patches/0069-Fix-Biome-Decoration-Crashes.patch

@@ -1,4 +1,4 @@
-From 6e2992826ace9cace8cab51a9fa10f4aeeef02ee Mon Sep 17 00:00:00 2001
+From 99e4136c831158d35954f6dfd3c7df956d3166b8 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 5 Jan 2014 09:35:01 +1100
 Subject: [PATCH] Fix Biome Decoration Crashes

CraftBukkit-Patches/0070-Save-ticks-lived-to-nbttag.patch

@@ -1,4 +1,4 @@
-From 8b0702543bb04a6d8f40e0cbdb5918a9dfea87ee Mon Sep 17 00:00:00 2001
+From 35929fa4ccb9b137ea9ba71960556e8b350da3a1 Mon Sep 17 00:00:00 2001
 From: DerFlash <bte@freenet.de>
 Date: Tue, 9 Jul 2013 00:11:12 +0200
 Subject: [PATCH] Save ticks lived to nbttag

CraftBukkit-Patches/0071-More-Efficient-GetCubes.patch

@@ -1,4 +1,4 @@
-From 7ff3821ee8e67caeca8a28ed04679ceb79010b33 Mon Sep 17 00:00:00 2001
+From f5aff1c6150386b0f6ed9d72fbd2ef545a4b1182 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 11 Jun 2013 12:17:37 +1000
 Subject: [PATCH] More Efficient GetCubes

CraftBukkit-Patches/0072-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch

@@ -1,4 +1,4 @@
-From 2a00eb8a54efd19242c35ab1b0e4eefed740cb5f Mon Sep 17 00:00:00 2001
+From f15a5c56868c9a2cc8e7e8b9d242545a93b4ef5e Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 2 Feb 2014 16:55:46 +0000
 Subject: [PATCH] Add Option to Nerf Mobs from Spawner's

CraftBukkit-Patches/0073-Warn-if-PermGen-may-be-insufficient.patch

@@ -1,4 +1,4 @@
-From 769391e3693495e22429582900873ec508d00dbe Mon Sep 17 00:00:00 2001
+From adfff3c12ad93f7f3b48f7baf9d648627223e170 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 23 Dec 2013 14:07:41 +1100
 Subject: [PATCH] Warn if PermGen may be insufficient

CraftBukkit-Patches/0074-Disable-Connected-Check-on-setScoreboard.patch

@@ -1,14 +1,14 @@
-From 169fe9965d4bd6da2336398d0a353e3f6d05f8cd Mon Sep 17 00:00:00 2001
+From 3c7258e5cfca3d6d3fe63c3debdc8afbc767925e Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 23 Dec 2013 15:57:57 +1100
 Subject: [PATCH] Disable Connected Check on setScoreboard
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c8787cf..c96c432 100644
+index 6960a29..5a39069 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1225,7 +1225,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1221,7 +1221,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              throw new IllegalStateException("Cannot set scoreboard yet");
          }
          if (playerConnection.isDisconnected()) {

CraftBukkit-Patches/0075-Add-Late-Bind-Option.patch

@@ -1,4 +1,4 @@
-From 7f5e5194bd11e6669f6b9c2e3ce1b38e85411956 Mon Sep 17 00:00:00 2001
+From 42dcfeeb17332d00efa384937a60f3a063737c43 Mon Sep 17 00:00:00 2001
 From: slide23 <me@slide.ws>
 Date: Fri, 20 Dec 2013 20:15:33 -0600
 Subject: [PATCH] Add Late Bind Option

CraftBukkit-Patches/0076-Allow-statistics-to-be-disabled-forced.patch

@@ -1,4 +1,4 @@
-From a5b5ae6423008efad34229f0d333432365d22eec Mon Sep 17 00:00:00 2001
+From 3df787b4f38038fbf74c5fdc2f3e09d048e86388 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Tue, 7 Jan 2014 15:56:26 +0000
 Subject: [PATCH] Allow statistics to be disabled/forced

CraftBukkit-Patches/0077-Fix-anvil-collisions.patch

@@ -1,4 +1,4 @@
-From e963131042579be23e566b7b326e1516955b2fe8 Mon Sep 17 00:00:00 2001
+From 966a4196a0d442611e8aa75cd80eda3713c66008 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Thu, 9 Jan 2014 14:19:12 +0000
 Subject: [PATCH] Fix anvil collisions

CraftBukkit-Patches/0078-Fix-ItemStack-Unbreakable-Code.patch

@@ -1,11 +1,11 @@
-From 5f95f690767115879007e1971575bfe91d3b710e Mon Sep 17 00:00:00 2001
+From 5dcfb85231b0820ef51a3fd1b9f4bdf2867f903f Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 10 Jan 2014 15:15:50 +1100
 Subject: [PATCH] Fix ItemStack Unbreakable Code
 
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 05d7c4e..2723ccb 100644
+index a2ab06a..7d2d401 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -228,7 +228,13 @@ public final class ItemStack {

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

@@ -1,4 +1,4 @@
-From c1f169eb0d0b24c2d56c853920cb54b09e0cf789 Mon Sep 17 00:00:00 2001
+From 326870b58da26934e61f4598c1650d89105e0b41 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

CraftBukkit-Patches/0080-Replace-AutoSave-Mechanism.patch

@@ -1,4 +1,4 @@
-From f47619fa36a666e37d58e2178f1acb04550a4afd Mon Sep 17 00:00:00 2001
+From 3cab58a89c92eab6316f285fa419ce09c49bc2b0 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] Replace AutoSave Mechanism
@@ -6,7 +6,7 @@ Subject: [PATCH] Replace AutoSave Mechanism
 The problem here is that MinecraftServer.save(..), will attempt to sleep whilst all pending chunks are written to disk, however due to various and complicated bugs, it will wait for an incorrect amount of chunks, which may cause it to sleep for an overly long amount of time. Instead we will mimic the save-all command in its behaviour, which is both safe and performant.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index edd781e..622e522 100644
+index 28471d6..8ff8d9f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -583,7 +583,16 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo

CraftBukkit-Patches/0081-Block-data-values-that-crash-the-client.patch

@@ -1,11 +1,11 @@
-From 05ae31b837b5ba85a42d524cf57ae8898a68bed1 Mon Sep 17 00:00:00 2001
+From 871021795c88fb39e7677f38af2281a321d852e1 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Wed, 15 Jan 2014 21:52:47 +0000
 Subject: [PATCH] Block data values that crash the client
 
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 04c0d64..5641ad7 100644
+index b1213f0..cbcc9e9 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -143,7 +143,7 @@ public class Chunk {

CraftBukkit-Patches/0082-Support-vanilla-s-direction-tag-on-fireballs.patch

@@ -1,4 +1,4 @@
-From c0d47c921873aefbcd521a49e1ca4b2fe4e229c0 Mon Sep 17 00:00:00 2001
+From 2b1c58da2148476cb86ccd2d5735ced60c994a58 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Sat, 18 Jan 2014 14:27:03 +0000
 Subject: [PATCH] Support vanilla's direction tag on fireballs

CraftBukkit-Patches/0083-Support-non-prefixed-URLs.patch

@@ -1,4 +1,4 @@
-From 74c918db5acf2e55d50ec74a002c94b5a324eda8 Mon Sep 17 00:00:00 2001
+From af9162fb9071d162935ba10077e4cc3f823361b4 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Sat, 18 Jan 2014 19:32:42 +0000
 Subject: [PATCH] Support non-prefixed URLs

CraftBukkit-Patches/0084-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch

@@ -1,4 +1,4 @@
-From 283681575a9a1a54671903e53cd098128e64bc08 Mon Sep 17 00:00:00 2001
+From 598322bca53525489f591d5c059af60b47d4e65b Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 20 Jan 2014 13:44:07 +1100
 Subject: [PATCH] Catch stalling on corrupted map data / NBT arrays.

CraftBukkit-Patches/0085-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch

@@ -1,4 +1,4 @@
-From f31c96292e6dcf2c7eb36c540e31530be32eddeb Mon Sep 17 00:00:00 2001
+From b1b17791ca84eb2b8450716e591731fc34ee44e2 Mon Sep 17 00:00:00 2001
 From: Dmck2b <dmck2b+github@gmail.com>
 Date: Mon, 20 Jan 2014 20:18:23 +0000
 Subject: [PATCH] Allow toggling of ZombiePigmen spawning in portal blocks

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

@@ -1,11 +1,11 @@
-From 660928dd4dcdd2929af3c2ea7a5f3244d3d90c0e Mon Sep 17 00:00:00 2001
+From 69feb252a24d7e1a6413d1b62c87125ed107d22c 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 622e522..d6cd151 100644
+index 8ff8d9f..4c9c3a8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -107,6 +107,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo

CraftBukkit-Patches/0087-Add-Spigot-Links.patch

@@ -1,4 +1,4 @@
-From c503e721883271f733720ccec29a36b1d48535fb Mon Sep 17 00:00:00 2001
+From 3c992adcd28936bd042215fa6180135728e95f0d Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Thu, 23 Jan 2014 13:17:35 +1100
 Subject: [PATCH] Add Spigot Links

CraftBukkit-Patches/0088-Configurable-Ping-Sample-Size.patch

@@ -1,4 +1,4 @@
-From f9ee498632c0c8ebea52cee04a050647ee850f4b Mon Sep 17 00:00:00 2001
+From 9d2e381350961f68acd219f86e257237934dc645 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

CraftBukkit-Patches/0089-Add-Optional-Tick-Shuffling.patch

@@ -1,4 +1,4 @@
-From 578d974237e631aa8d5da33bf196892ec67aecdd Mon Sep 17 00:00:00 2001
+From 858714e486e105bf61645731323132cf6059dfa0 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 27 Jan 2014 08:39:26 +1100
 Subject: [PATCH] Add Optional Tick Shuffling

CraftBukkit-Patches/0090-Allow-Configuring-Chunks-per-Packet.patch

@@ -1,11 +1,11 @@
-From d48d4d4439f96703651ab58bbc298f50f6d443c6 Mon Sep 17 00:00:00 2001
+From dad777bc8491fbbac59ab6929003ce7be400a639 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 28 Jan 2014 20:35:35 +1100
 Subject: [PATCH] Allow Configuring Chunks per Packet
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index f74e175..8ffa3bc 100644
+index 46aa10e..7eb66ea 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -214,7 +214,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

CraftBukkit-Patches/0091-Implement-Locale-Getter-for-Players.patch

@@ -1,11 +1,11 @@
-From d94a53ba309c95b6c449908e78b5de529c71ab5d Mon Sep 17 00:00:00 2001
+From 991a52b5b0491761079cc39b3d02638bfb975018 Mon Sep 17 00:00:00 2001
 From: Smove <jan@lavasurvival.net>
 Date: Sat, 1 Feb 2014 18:12:16 +1100
 Subject: [PATCH] Implement Locale Getter for Players
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 8ffa3bc..8aa530f 100644
+index 7eb66ea..a48a1c0 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -30,7 +30,7 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
@@ -18,10 +18,10 @@ index 8ffa3bc..8aa530f 100644
      public final MinecraftServer server;
      public final PlayerInteractManager playerInteractManager;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c96c432..b311958 100644
+index 5a39069..3ef8662 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1367,6 +1367,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1363,6 +1363,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
                  getHandle().playerConnection.sendPacket( packet );
              }
          }

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

@@ -1,4 +1,4 @@
-From 01391006b22d809e1aa09a6da7ba1e8ef8147b8d Mon Sep 17 00:00:00 2001
+From 9d6db78d4a1e4c06eda42e3e5a772844d15986dd 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

CraftBukkit-Patches/0093-Fix-dispensing-bone-meal-not-having-the-correct-data.patch

@@ -1,4 +1,4 @@
-From f6b8c550cdb769120c06e9654fedfd0ecfd77f7f Mon Sep 17 00:00:00 2001
+From 530ce2555ba9c02a750ecb17d21c4e57e89a3cb5 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Thu, 6 Feb 2014 21:59:20 +0000
 Subject: [PATCH] Fix dispensing bone meal not having the correct data value

CraftBukkit-Patches/0094-Spam-Filter-Exclusions.patch

@@ -1,11 +1,11 @@
-From 64793a51c1aef0c4f6e04ccbe24b319ffc2d17bb Mon Sep 17 00:00:00 2001
+From 7b576c1e1545ac2ac33fc690b44de8c70cd5eb3e Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 8 Feb 2014 08:13:40 +0000
 Subject: [PATCH] Spam Filter Exclusions
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 1ee5541..79d8fe0 100644
+index c833842..daa524f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -850,9 +850,19 @@ public class PlayerConnection implements PacketPlayInListener {

CraftBukkit-Patches/0095-Add-Option-to-Silence-CommandBlock-Console.patch

@@ -1,4 +1,4 @@
-From 83d82f5446b7d93b0295aceabe28023c93ebd648 Mon Sep 17 00:00:00 2001
+From 5b1d11e3500775fdcedbb9d4572072355dccaf18 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 9 Feb 2014 14:39:01 +1100
 Subject: [PATCH] Add Option to Silence CommandBlock Console

CraftBukkit-Patches/0096-Add-support-for-fetching-hidden-players.patch

@@ -1,14 +1,14 @@
-From 49dad7268b3e4e5c7bc98bac7f306b90da0e667e Mon Sep 17 00:00:00 2001
+From 37fca1a7ed31f10e11b84ed98462fb712a05a28d Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Sun, 9 Feb 2014 14:03:03 -0500
 Subject: [PATCH] Add support for fetching hidden players
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b311958..0c4153f 100644
+index 3ef8662..5011579 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1373,6 +1373,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1369,6 +1369,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          {
             return getHandle().locale;
          }

CraftBukkit-Patches/0097-Allow-Disabling-Creative-Item-Filter.patch

@@ -1,11 +1,11 @@
-From 36abb5407fb6a2f866b44034f04d93301b6b0285 Mon Sep 17 00:00:00 2001
+From b32a5d9137cf640666544ea2467180c5afcf7f1a Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 12 Feb 2014 18:18:01 +1100
 Subject: [PATCH] Allow Disabling Creative Item Filter
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 79d8fe0..c9e99e9 100644
+index daa524f..a0157af 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1499,7 +1499,7 @@ public class PlayerConnection implements PacketPlayInListener {

CraftBukkit-Patches/0098-Cap-Channel-Registrations.patch

@@ -1,14 +1,14 @@
-From 6a59c9e9712c8dd542a3a577535a3092268d8868 Mon Sep 17 00:00:00 2001
+From 93205306b35b628668d46294d38f9f005900a880 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 12 Feb 2014 20:02:58 +1100
 Subject: [PATCH] Cap Channel Registrations
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0c4153f..625e6f3 100644
+index 5011579..27d3715 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1056,6 +1056,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1052,6 +1052,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void addChannel(String channel) {

CraftBukkit-Patches/0099-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch

@@ -1,4 +1,4 @@
-From 6c9d15cd9c4cb3a9ce49e30ddf3b1e06a4b42ff2 Mon Sep 17 00:00:00 2001
+From 70f73aba5be31d49fad0972f45dae646103aeb67 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Wed, 12 Feb 2014 20:44:14 +0000
 Subject: [PATCH] Allow vanilla commands to be the main version of a command

CraftBukkit-Patches/0100-Unfinalize-the-isDisconnected-method-by-bukkit.patch

@@ -1,4 +1,4 @@
-From 159aa84f168b08cb2ec2a22fd594bd6f60f20e13 Mon Sep 17 00:00:00 2001
+From f3d9fca51a9fbca5d4d7979e063e85319e00fdd3 Mon Sep 17 00:00:00 2001
 From: hcherndon <hcherndon@gmail.com>
 Date: Sat, 15 Feb 2014 01:51:20 -0600
 Subject: [PATCH] Unfinalize the isDisconnected() method by bukkit.
@@ -6,7 +6,7 @@ Subject: [PATCH] Unfinalize the isDisconnected() method by bukkit.
 This would literally mean the world to me. You have no idea how much this method being final is fucking me over right now. (Working with NPC's and what not.)
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index c9e99e9..20fe15e 100644
+index a0157af..096ac2d 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1885,7 +1885,7 @@ public class PlayerConnection implements PacketPlayInListener {

CraftBukkit-Patches/0101-Implement-Silenceable-Lightning-API.patch

@@ -1,4 +1,4 @@
-From 81d47173905b4ca774bc99346725d4d2007af677 Mon Sep 17 00:00:00 2001
+From 586fced5ff68ebbc6a947395bab90b2822f71b4e Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Sun, 23 Feb 2014 16:16:59 -0400
 Subject: [PATCH] Implement Silenceable Lightning API
@@ -37,7 +37,7 @@ index 66402a0..0671659 100644
              //this.world.makeSound(this.locX, this.locY, this.locZ, "ambient.weather.thunder", 10000.0F, 0.8F + this.random.nextFloat() * 0.2F);
              float pitch = 0.8F + this.random.nextFloat() * 0.2F;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 92c9851..d9e3436 100644
+index 53a5d37..92f7188 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1361,6 +1361,22 @@ public class CraftWorld implements World {

CraftBukkit-Patches/0102-Use-one-PermissibleBase-for-all-Command-Blocks.patch

@@ -1,4 +1,4 @@
-From 26c6bf2cd39dc4ac183e63fa860440c7310f5bc9 Mon Sep 17 00:00:00 2001
+From ad71a1a7d850ac7b565ddcc3947db9fd0cfd46f7 Mon Sep 17 00:00:00 2001
 From: FrozenBrain <carstenbamsti@googlemail.com>
 Date: Sun, 2 Mar 2014 21:13:46 +0100
 Subject: [PATCH] Use one PermissibleBase for all Command Blocks

CraftBukkit-Patches/0103-Prevent-hoppers-from-loading-chunks.patch

@@ -1,4 +1,4 @@
-From db2418630250c00135a3d87a2ed9572888e8071b Mon Sep 17 00:00:00 2001
+From 7c704f1b5496f68f6f5d0b08a986949aeca38306 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Wed, 5 Mar 2014 20:27:27 +0000
 Subject: [PATCH] Prevent hoppers from loading chunks

CraftBukkit-Patches/0104-Guard-Entity-List.patch

@@ -1,4 +1,4 @@
-From 66cfb13b1cda70fadcff6584ddf65fefca07bc03 Mon Sep 17 00:00:00 2001
+From 822ad01e4d1c276c88f489d03e4dab3618fbac84 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 10 Mar 2014 09:03:28 +1100
 Subject: [PATCH] Guard Entity List

CraftBukkit-Patches/0105-Fix-ConcurrentModificationException-while-being-idle.patch

@@ -1,4 +1,4 @@
-From 105ad265e192a49620e3c4ffd7c2703f54bc67ef Mon Sep 17 00:00:00 2001
+From 76b7d0de2ea2ef54ad2ed72fcc8c72c8bfd52672 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Tue, 14 Jan 2014 20:11:25 +0000
 Subject: [PATCH] Fix ConcurrentModificationException while being idle kicked

CraftBukkit-Patches/0106-Cancellable-WitherSkull-potion-effect.patch

@@ -1,4 +1,4 @@
-From 2f05a58ede2a5032c0fd25773339cbd7a5045481 Mon Sep 17 00:00:00 2001
+From 1960062f0a6803e4894faf6efcf7366d90c8b474 Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Tue, 25 Feb 2014 15:15:26 -0400
 Subject: [PATCH] Cancellable WitherSkull potion effect

CraftBukkit-Patches/0107-Descriptive-kick-reasons-instead-of-Nope.patch

@@ -1,4 +1,4 @@
-From 5f56948ccf057ab3c7883d6d6259923b168c9f65 Mon Sep 17 00:00:00 2001
+From 4a61150869e110f840be0425e2e460f336789687 Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Sat, 15 Mar 2014 01:30:05 -0400
 Subject: [PATCH] Descriptive kick reasons instead of Nope!
@@ -27,7 +27,7 @@ index b258f15..56b5980 100644
              f1 = 0;
          }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 20fe15e..b04969a 100644
+index 096ac2d..38ed1bf 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -185,7 +185,7 @@ public class PlayerConnection implements PacketPlayInListener {

CraftBukkit-Patches/0108-Check-for-manually-prefixed-commands-or-commands-tha.patch

@@ -1,4 +1,4 @@
-From 3f79004c8413861b21c2d26d7eeabbe3c2025c24 Mon Sep 17 00:00:00 2001
+From e42ae1ae4a3604569b1ac5b944fd237e7c9f80b6 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Sun, 23 Mar 2014 01:12:10 +0000
 Subject: [PATCH] Check for manually prefixed commands or commands that don't

CraftBukkit-Patches/0109-Cap-window-names-to-prevent-client-disconnects.patch

@@ -1,4 +1,4 @@
-From b0c05e88f85072e7d8f9c00a2fbb1ac2fab2019c Mon Sep 17 00:00:00 2001
+From 61ebe85f3f5c6e3622a1f42bf428e5f7b40ac48c Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Sun, 23 Mar 2014 10:53:48 +0000
 Subject: [PATCH] Cap window names to prevent client disconnects

CraftBukkit-Patches/0110-Enable-Improved-Ping-Sending.patch

@@ -1,11 +1,11 @@
-From 10a0d81c95c08d180d8c582305d36718c8b349de Mon Sep 17 00:00:00 2001
+From 65b274583619850e5d5431cbd1b949c662e2e220 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Feb 2013 20:45:20 +1100
 Subject: [PATCH] Enable Improved Ping Sending
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 8aa530f..479203a 100644
+index a48a1c0..413af68 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -62,6 +62,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

CraftBukkit-Patches/0111-Configurable-dragon-death-and-wither-spawn-sounds.patch

@@ -1,4 +1,4 @@
-From 90676712a5c0c79cb6d805d27f8c1cbbb888d594 Mon Sep 17 00:00:00 2001
+From 27e3dab4503d81f04dceb2f54d2d893b06e94426 Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Sat, 29 Mar 2014 13:44:25 -0400
 Subject: [PATCH] Configurable dragon death and wither spawn sounds

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

@@ -1,4 +1,4 @@
-From a2db9f5be196af9f3daa43b0d8e3b3b54805509e Mon Sep 17 00:00:00 2001
+From 090e9e21488a6d97b4e862a031aaf1f26f1a4a10 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,7 +6,7 @@ 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 d6cd151..03630d1 100644
+index 4c9c3a8..c62d9fe 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -979,7 +979,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo

CraftBukkit-Patches/0113-Old-New-Version-Support.patch

@@ -1,4 +1,4 @@
-From 8d6e8268b01132a6276f0ee6fd88b1196b14ed66 Mon Sep 17 00:00:00 2001
+From 91421b146b7bd397f5262c71e104e39d074c70e4 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 12 Apr 2014 15:11:15 +1000
 Subject: [PATCH] Old / New Version Support.

CraftBukkit-Patches/0114-Treat-Bungee-as-Online-Mode.patch

@@ -1,4 +1,4 @@
-From f981d80539e8691a9a91b174e30f16e8107ceff8 Mon Sep 17 00:00:00 2001
+From c8cf8f7c23d03162663e99ac6ee797dd0cc11f45 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 12 Apr 2014 21:23:58 +1000
 Subject: [PATCH] Treat Bungee as Online Mode

CraftBukkit-Patches/0115-Fix-several-occurances-of-missed-diff.patch

@@ -1,4 +1,4 @@
-From bfba84240f75dc7556bc6705de356da944ffae6a Mon Sep 17 00:00:00 2001
+From 6b4902dcb02b8372794b4bf46e2ad4b362d0df20 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 12 Apr 2014 17:49:14 +1000
 Subject: [PATCH] Fix several occurances of missed diff.
@@ -44,7 +44,7 @@ index a45bed9..98a4ac7 100644
  
      public void setItemStack(ItemStack itemstack) {
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index b04969a..0804fe7 100644
+index 38ed1bf..c80e06f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1738,7 +1738,7 @@ public class PlayerConnection implements PacketPlayInListener {

CraftBukkit-Patches/0116-Update-Warning.patch

@@ -1,4 +1,4 @@
-From 8409366f56ee25da9876720d06a598726d37a63a Mon Sep 17 00:00:00 2001
+From 7afd8b34ea74393347085a916129d8cc4d188967 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 12 Apr 2014 21:37:12 +1000
 Subject: [PATCH] Update Warning

CraftBukkit-Patches/0117-Add-Conversion-Message.patch

@@ -1,4 +1,4 @@
-From cfa147e2d5e9a2471080e2a427959a6a66471eed Mon Sep 17 00:00:00 2001
+From 0f1eab040327d6363ea70a61e3d15d817fb3bcce Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 12 Apr 2014 23:30:44 +1000
 Subject: [PATCH] Add Conversion Message

CraftBukkit-Patches/0117-Fix-PlayerFishEvent-not-properly-cancelling.-Fixes-B.patch

@@ -1,59 +0,0 @@
-From 6f6ef3a221275b26a887af6e87238e4c84ebbd50 Mon Sep 17 00:00:00 2001
-From: myiume <cursed_kidd@yahoo.com>
-Date: Wed, 19 Feb 2014 15:40:37 +0200
-Subject: [PATCH] Fix PlayerFishEvent not properly cancelling. Fixes
- BUKKIT-5245,BUKKIT-5396
-
-PlayerFishEvent event states are not properly being cancelled,
-the FishingHookEntity being deleted when the event is cancelled,
-thus making the event happen. The event states of CAUGHT_ENTITY,
-CAUGHT_FISH, FAILED_ATTEMPT, IN_GROUND must keep the
-EntityFishingHook alive in order to cancel the event.
-Removed the entity despawn lines when event is cancelled
-and added a cancelled action for FAILED_ATTEMPT state.
-
-diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 2ee3f30..197dca1 100644
---- a/src/main/java/net/minecraft/server/EntityFishingHook.java
-+++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
-@@ -370,8 +370,6 @@ public class EntityFishingHook extends Entity {
-                 this.world.getServer().getPluginManager().callEvent(playerFishEvent);
- 
-                 if (playerFishEvent.isCancelled()) {
--                    this.die();
--                    this.owner.hookedFish = null;
-                     return 0;
-                 }
-                 // CraftBukkit end
-@@ -394,8 +392,6 @@ public class EntityFishingHook extends Entity {
-                 this.world.getServer().getPluginManager().callEvent(playerFishEvent);
- 
-                 if (playerFishEvent.isCancelled()) {
--                    this.die();
--                    this.owner.hookedFish = null;
-                     return 0;
-                 }
-                 // CraftBukkit end
-@@ -421,8 +417,6 @@ public class EntityFishingHook extends Entity {
-                 this.world.getServer().getPluginManager().callEvent(playerFishEvent);
- 
-                 if (playerFishEvent.isCancelled()) {
--                    this.die();
--                    this.owner.hookedFish = null;
-                     return 0;
-                 }
-                 // CraftBukkit end
-@@ -434,6 +428,10 @@ public class EntityFishingHook extends Entity {
-             if (b0 == 0) {
-                 PlayerFishEvent playerFishEvent = new PlayerFishEvent((Player) this.owner.getBukkitEntity(), null, (Fish) this.getBukkitEntity(), PlayerFishEvent.State.FAILED_ATTEMPT);
-                 this.world.getServer().getPluginManager().callEvent(playerFishEvent);
-+                
-+                if (playerFishEvent.isCancelled()) {
-+                    return 0;
-+                }
-             }
-             // CraftBukkit end
- 
--- 
-1.9.1
-

CraftBukkit-Patches/0118-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch

@@ -1,4 +1,4 @@
-From a5301c591ee9b8080f46018ae8cf232c5f59f31b Mon Sep 17 00:00:00 2001
+From 2034f8158f80d21ba34a9ad7e7ee55ce8366b52c Mon Sep 17 00:00:00 2001
 From: "gjmcferrin@gmail.com" <gjmcferrin@gmail.com>
 Date: Mon, 10 Feb 2014 10:05:11 -0500
 Subject: [PATCH] Properly cancel fishing event. Fixes BUKKIT-5396

CraftBukkit-Patches/0119-Print-Stack-on-InternalException.patch

@@ -1,4 +1,4 @@
-From 27204e8b4ae6964198ca7fa327fdc43460cf63d6 Mon Sep 17 00:00:00 2001
+From a8d37de28940d4989bc81b28534d5c345e1b6acd Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 13 Apr 2014 09:00:59 +1000
 Subject: [PATCH] Print Stack on InternalException

CraftBukkit-Patches/0120-Use-Offline-Player-Data-Once-if-Required.patch

@@ -1,4 +1,4 @@
-From bc602d48baa44477814f087b0130a07c22f10a10 Mon Sep 17 00:00:00 2001
+From 02e939c4fb70a3f007f80df82eb9da44651c4b2a Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 13 Apr 2014 14:41:23 +1000
 Subject: [PATCH] Use Offline Player Data Once if Required.

CraftBukkit-Patches/0121-Use-Provided-Case-for-Non-Existent-Offline-Players.patch

@@ -1,4 +1,4 @@
-From c2a3841f11df4d569cf97b81c867b893c922ed9e Mon Sep 17 00:00:00 2001
+From 9ae2b5bcbe267d7fa5ac0f25a1253d1d0d25cf62 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 14 Apr 2014 09:46:20 +1000
 Subject: [PATCH] Use Provided Case for Non Existent Offline Players

CraftBukkit-Patches/0122-Check-for-blank-OfflinePlayer-Names.patch

@@ -1,4 +1,4 @@
-From ba5f74c45a6b0ae5cfecc65c39f040a5048a63a1 Mon Sep 17 00:00:00 2001
+From 12ec78238d9e0cb0ceee5711e12b769e25d447e8 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 14 Apr 2014 17:21:24 +1000
 Subject: [PATCH] Check for blank OfflinePlayer Names

CraftBukkit-Patches/0123-Fix-Player-Banning.patch

@@ -1,4 +1,4 @@
-From a6c5c80d264dd85fb8d188a3870e39c7c6312e55 Mon Sep 17 00:00:00 2001
+From e3513c6da6e027909953fbb3b84cc5b8d6e83a42 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 15 Apr 2014 10:32:48 +1000
 Subject: [PATCH] Fix Player Banning

CraftBukkit-Patches/0124-Fix-ban-expire-dates.patch

@@ -1,4 +1,4 @@
-From f1a2a2c1dae93dc4565435fe65a23e92451e2c19 Mon Sep 17 00:00:00 2001
+From 7183b78572e9444634503a9ae0dee24797ece055 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 16 Apr 2014 10:09:56 +1000
 Subject: [PATCH] Fix ban expire dates.

CraftBukkit-Patches/0125-Correct-Ban-Expiration.patch

@@ -1,4 +1,4 @@
-From 713765b93a1ef90c5149c3768fb9fb2e74bb260a Mon Sep 17 00:00:00 2001
+From fd2e1774f783249ea62cefa1749c0087aa368192 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 16 Apr 2014 11:14:38 +1000
 Subject: [PATCH] Correct Ban Expiration

CraftBukkit-Patches/0126-Convert-Horses-owner-to-UUID.patch

@@ -1,4 +1,4 @@
-From 47209c2017a78db4067a20e28a7a9c266a74fd80 Mon Sep 17 00:00:00 2001
+From b194f0f92b7a35840d48e4c55bcda7de31b326ee Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 16 Apr 2014 01:40:30 -0400
 Subject: [PATCH] Convert Horses owner to UUID

CraftBukkit-Patches/0127-Expand-team-API-to-allow-arbitrary-strings.patch

@@ -1,4 +1,4 @@
-From 9119dfe5e378281bc33dc8b374f87543fd81fcff Mon Sep 17 00:00:00 2001
+From db62995c98f7a9aec46c832163f88769bccd61dd Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Thu, 17 Apr 2014 19:22:22 +1000
 Subject: [PATCH] Expand team API to allow arbitrary strings.

CraftBukkit-Patches/0128-Add-Score.isScoreSet-Z-API.patch

@@ -1,4 +1,4 @@
-From 177777bfb4c59668d0e829bf09af7eeb82e942f4 Mon Sep 17 00:00:00 2001
+From a0190354c7938e5153b1aafd3a14c76cfe64f242 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Thu, 17 Apr 2014 19:35:53 +1000
 Subject: [PATCH] Add Score.isScoreSet()Z API.

CraftBukkit-Patches/0129-Log-null-TileEntity-Owner.patch

@@ -1,4 +1,4 @@
-From 8aae71832ce1613267432eb152e62848c109c12a Mon Sep 17 00:00:00 2001
+From 2f92f78a8701acb8cdd525f7028d50f0ae70d3e7 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 20 Apr 2014 11:16:54 +1000
 Subject: [PATCH] Log null TileEntity Owner

CraftBukkit-Patches/0130-Don-t-special-case-invalid-usernames-for-UUIDs.patch

@@ -1,4 +1,4 @@
-From 27ba3045a7a2dc4b4562a4cd538bd3af1dfde473 Mon Sep 17 00:00:00 2001
+From c0b185d3802a16581921262f7f04c122338ed1d0 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 20 Apr 2014 18:58:00 +1000
 Subject: [PATCH] Don't special case 'invalid' usernames for UUIDs.

CraftBukkit-Patches/0131-Convert-player-skulls-async.patch

@@ -1,4 +1,4 @@
-From 4a519378aaf3ceca84a0e7f934e8600eb03e2c38 Mon Sep 17 00:00:00 2001
+From dcf9ef2c428d52d5a69cc6a05596620b2b6cd9db Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Sun, 20 Apr 2014 13:18:55 +0100
 Subject: [PATCH] Convert player skulls async

CraftBukkit-Patches/0132-Prevent-NoClassDefError-crash-and-notify-on-crash.patch

@@ -1,4 +1,4 @@
-From fe1bdeba27e02e1b0036a334271e6777e26043c0 Mon Sep 17 00:00:00 2001
+From 839055d48c9a99bd1d60feff14656d9e7354ab22 Mon Sep 17 00:00:00 2001
 From: David <dmck2b@gmail.com>
 Date: Mon, 21 Apr 2014 12:43:08 +0100
 Subject: [PATCH] Prevent NoClassDefError crash and notify on crash

CraftBukkit-Patches/0133-Check-Skull-canPlace.patch

@@ -1,4 +1,4 @@
-From 8d34503e826ede14b337454e9188bc833ed5cbda Mon Sep 17 00:00:00 2001
+From 3655091ed2427de66e8fe1bc115b824c47f99404 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 15 Apr 2014 10:48:35 +1000
 Subject: [PATCH] Check Skull canPlace

CraftBukkit-Patches/0134-Don-t-let-trees-replace-any-block.patch

@@ -1,4 +1,4 @@
-From cd96be6bb68af25e5498e24a758c602d681b506f Mon Sep 17 00:00:00 2001
+From fb930fccd170e6b184946f4e71119e0bce1520a8 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Mon, 20 Jan 2014 20:42:28 +0000
 Subject: [PATCH] Don't let trees replace any block.

CraftBukkit-Patches/0135-Fix-race-condition-that-could-kill-connections-befor.patch

@@ -1,4 +1,4 @@
-From ea2b784ee80f96adc590a68530786ab433efdb55 Mon Sep 17 00:00:00 2001
+From fd151cc8d3920be62b8dcdbeb29a78da5a98ac69 Mon Sep 17 00:00:00 2001
 From: Jonas Konrad <me@yawk.at>
 Date: Fri, 25 Apr 2014 23:46:46 +0200
 Subject: [PATCH] Fix race condition that could kill connections before they

CraftBukkit-Patches/0136-Configurable-UserCache-cap.patch

@@ -1,4 +1,4 @@
-From d31b06968d185d3f4f03f6c90ada1480415e3aca Mon Sep 17 00:00:00 2001
+From 11686f69378066eb0f63e19ac2b83314d8669fc8 Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Fri, 25 Apr 2014 18:17:30 -0400
 Subject: [PATCH] Configurable UserCache cap

CraftBukkit-Patches/0137-Implement-PlayerSpawnLocationEvent.patch

@@ -1,4 +1,4 @@
-From 1e6c4cd85b190314a6c15c05fd2b006270c4fcbc Mon Sep 17 00:00:00 2001
+From 7d22666fbdc330cf52f1beaebccb550ee60e0aa7 Mon Sep 17 00:00:00 2001
 From: ninja <xninja@openmailbox.org>
 Date: Tue, 8 Apr 2014 14:05:19 +0200
 Subject: [PATCH] Implement PlayerSpawnLocationEvent.

CraftBukkit-Patches/0138-Cap-Objective-Score-Length.patch

@@ -1,4 +1,4 @@
-From af84186d14145f69520f8c9a58b2f6434e0c7e06 Mon Sep 17 00:00:00 2001
+From c74bd3384bf81012a0eb121ec2f27b047e1c0b77 Mon Sep 17 00:00:00 2001
 From: hauno <imhauno@gmail.com>
 Date: Tue, 6 May 2014 18:01:37 -0700
 Subject: [PATCH] Cap Objective Score Length

CraftBukkit-Patches/0139-Process-conversation-input-on-the-main-thread.-Fixes.patch

@@ -1,4 +1,4 @@
-From a9b22efe398e06c3376a674f74e63ad12786f2b7 Mon Sep 17 00:00:00 2001
+From 38b9953601d971d2dc45f32d10a205e6eaf215f2 Mon Sep 17 00:00:00 2001
 From: riking <rikingcoding@gmail.com>
 Date: Wed, 14 May 2014 13:46:48 -0700
 Subject: [PATCH] Process conversation input on the main thread. Fixes
@@ -6,7 +6,7 @@ Subject: [PATCH] Process conversation input on the main thread. Fixes
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 0804fe7..9491101 100644
+index c80e06f..024ec84 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -835,7 +835,18 @@ public class PlayerConnection implements PacketPlayInListener {

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

@@ -1,11 +1,11 @@
-From 9cdc944a0cb40b8d53cd12d948db27c4fa569ef2 Mon Sep 17 00:00:00 2001
+From 45094802bda666b59731622591c78064286efa95 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 03630d1..aa459a5 100644
+index c62d9fe..d5d9ebc 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -419,6 +419,13 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo

CraftBukkit-Patches/0141-Prevent-Unbounded-IntCache-Growth.patch

@@ -1,4 +1,4 @@
-From fc0bdcd14ce8e649c564e34505da292481d4d83b Mon Sep 17 00:00:00 2001
+From 60944a311fc57886c97c4a7c6c74ca605320b32f Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 20 Jun 2014 19:40:00 +1000
 Subject: [PATCH] Prevent Unbounded IntCache Growth

CraftBukkit-Patches/0142-Fix-explosions-not-moving-invulnerable-entities.patch

@@ -1,4 +1,4 @@
-From 27c15c1043d53ea191c58a52825b570a27b94b20 Mon Sep 17 00:00:00 2001
+From c4145784b7b40a92675b5def974a12ed996a0817 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Thu, 26 Jun 2014 14:29:11 +0100
 Subject: [PATCH] Fix explosions not moving invulnerable entities

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

@@ -1,11 +1,11 @@
-From 93d639c32e8655d78c9944ddf8a19f5fce9b7832 Mon Sep 17 00:00:00 2001
+From 527c4beb51f768863a2acceb5a30e9a159c49dcd 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 6cc8a2d..feac545 100644
+index 029652d..d452df7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -207,7 +207,7 @@ public class CraftEventFactory {
@@ -17,7 +17,7 @@ index 6cc8a2d..feac545 100644
          }
          return callPlayerInteractEvent(who, action, 0, 256, 0, 0, itemstack);
      }
-@@ -479,7 +479,7 @@ public class CraftEventFactory {
+@@ -484,7 +484,7 @@ public class CraftEventFactory {
              if (source == DamageSource.CACTUS) {
                  cause = DamageCause.CONTACT;
              } else {
@@ -26,7 +26,7 @@ index 6cc8a2d..feac545 100644
              }
              EntityDamageEvent event = callEvent(new EntityDamageByBlockEvent(damager, entity.getBukkitEntity(), cause, modifiers, modifierFunctions));
              if (!event.isCancelled()) {
-@@ -497,7 +497,7 @@ public class CraftEventFactory {
+@@ -502,7 +502,7 @@ public class CraftEventFactory {
              } else if (source == DamageSource.FALL) {
                  cause = DamageCause.FALL;
              } else {
@@ -35,7 +35,7 @@ index 6cc8a2d..feac545 100644
              }
              EntityDamageEvent event = callEvent(new EntityDamageByEntityEvent(damager, entity.getBukkitEntity(), cause, modifiers, modifierFunctions));
              if (!event.isCancelled()) {
-@@ -535,7 +535,7 @@ public class CraftEventFactory {
+@@ -540,7 +540,7 @@ public class CraftEventFactory {
              return callEntityDamageEvent(null, entity, cause, modifiers, modifierFunctions);
          }
  

CraftBukkit-Patches/0144-Cross-World-Entity-Teleportation.patch

@@ -1,4 +1,4 @@
-From 81b0beb9e6bceb7a05a843bbe59ec6e20425bd38 Mon Sep 17 00:00:00 2001
+From 21cec57a34f6b3de2d0147f53fe47b799d65995c 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,12 +6,12 @@ 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 96d763b..26a6253 100644
+index ce18aea..1c8099d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -205,7 +205,14 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
-             return false;
-         }
+@@ -208,7 +208,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);
  
 -        entity.world = ((CraftWorld) location.getWorld()).getHandle();
 +        // Spigot start

CraftBukkit-Patches/0145-Limit-block-placement-interaction-packets.patch

@@ -1,11 +1,11 @@
-From 9bdd9990787595e243785731f966254860a20a3a Mon Sep 17 00:00:00 2001
+From df01fcb7e6f82f93930252373a4b6c1dc0f0b09b Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Sun, 29 Jun 2014 21:10:34 +0100
 Subject: [PATCH] Limit block placement/interaction packets
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 9491101..20c49e3 100644
+index 024ec84..bd61823 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -573,7 +573,20 @@ public class PlayerConnection implements PacketPlayInListener {

CraftBukkit-Patches/0146-Better-item-validation.patch

@@ -1,4 +1,4 @@
-From c09d735f8bf44a0e32ca62cf6179d4acae8461a2 Mon Sep 17 00:00:00 2001
+From 9fb3a495d25e376af9ecfaac0843ba6e339cc7d8 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Wed, 2 Jul 2014 23:35:51 +0100
 Subject: [PATCH] Better item validation

CraftBukkit-Patches/0147-Further-Seed-Customisation.patch

@@ -1,4 +1,4 @@
-From b383c6bc3a5c83451554b0aa7889ad0f5a114acf Mon Sep 17 00:00:00 2001
+From feb0cb28efeb693ea946ea7cf1b8fdb752961e40 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 4 Jul 2014 13:28:45 +1000
 Subject: [PATCH] Further Seed Customisation