Upstream merge - remove url fix as it was pulled upstream

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

@@ -1,4 +1,4 @@
-From 376a98c626d952be1ec7c4b0243c54a4f205fb23 Mon Sep 17 00:00:00 2001
+From 2bbed3fa984bfd2263d81a5a1917bbffe6268074 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/0073-Support-non-prefixed-URLs.patch

@@ -1,41 +0,0 @@
-From fc8066aa363f20a5c37f8789294943d7f56e16a1 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
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
-index 844bf6a..0481688 100644
---- a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
-@@ -19,7 +19,7 @@ import com.google.common.collect.ImmutableMap.Builder;
- public final class CraftChatMessage {
-     private static class StringMessage {
-         private static final Map<Character, EnumChatFormat> formatMap;
--        private static final Pattern INCREMENTAL_PATTERN = Pattern.compile("(" + String.valueOf(org.bukkit.ChatColor.COLOR_CHAR) + "[0-9a-fk-or])|(\\n)|(?:(https?://[^ ][^ ]*?)(?=[\\.\\?!,;:]?(?:[ \\n]|$)))", Pattern.CASE_INSENSITIVE);
-+        private static final Pattern INCREMENTAL_PATTERN = Pattern.compile("(" + String.valueOf(org.bukkit.ChatColor.COLOR_CHAR) + "[0-9a-fk-or])|(\\n)|((?:(?:https?)://)?(?:[-\\w_\\.]{2,}\\.[a-z]{2,4}.*?(?=[\\.\\?!,;:]?(?:[" + String.valueOf(org.bukkit.ChatColor.COLOR_CHAR) + " \\n]|$))))", Pattern.CASE_INSENSITIVE);
- 
-         static {
-             Builder<Character, EnumChatFormat> builder = ImmutableMap.builder();
-@@ -89,6 +89,9 @@ public final class CraftChatMessage {
-                     }
-                     break;
-                 case 3:
-+                    if ( !( match.startsWith( "http://" ) || match.startsWith( "https://" ) ) ) {
-+                        match = "http://" + match;
-+                    }
-                     modifier.setChatClickable(new ChatClickable(EnumClickAction.OPEN_URL, match));
-                     appendNewComponent(matcher.end(groupId));
-                     modifier.setChatClickable((ChatClickable) null);
-@@ -100,7 +103,7 @@ public final class CraftChatMessage {
-                 appendNewComponent(message.length());
-             }
- 
--            output = list.toArray(new IChatBaseComponent[0]);
-+            output = list.toArray(new IChatBaseComponent[list.size()]);
-         }
- 
-         private void appendNewComponent(int index) {
--- 
-2.1.0
-

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

@@ -1,4 +1,4 @@
-From c39b1e98057b0fa00d788e6da9c6c99e06503763 Mon Sep 17 00:00:00 2001
+From 2538b669a92eba5a1e0dc4223b80e3a15c48b909 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/0075-Highly-Optimized-Tick-Loop.patch

@@ -1,4 +1,4 @@
-From 5ceb8bec0a5b6d0c209c4fec89ca28b86a34ff9e Mon Sep 17 00:00:00 2001
+From 7ff39877dc381c5b10ab475fdc53dafb29bbae6d 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

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

@@ -1,4 +1,4 @@
-From 5bc28242a60cdc16a143b6e711e43dfff9b9b6bd Mon Sep 17 00:00:00 2001
+From 83e62bf5499a5ef9b9c1d80d83a6620bdd86e70e 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/0077-Configurable-Ping-Sample-Size.patch

@@ -1,4 +1,4 @@
-From 4577b3294c5d498feae4d28113347212d7a6a5d1 Mon Sep 17 00:00:00 2001
+From 79e756fa43b526614730344d5b457f616d026c6e 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/0078-Add-Optional-Tick-Shuffling.patch

@@ -1,4 +1,4 @@
-From 8c82568bb061577addd20a69f8e3197c593e9c5e Mon Sep 17 00:00:00 2001
+From 2b36ecf085e1a0339305ab4ec9a8227c15426d69 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/0079-Allow-Configuring-Chunks-per-Packet.patch

@@ -1,11 +1,11 @@
-From c3741d045436029602f6d03b24a376a9bbe92cf7 Mon Sep 17 00:00:00 2001
+From 0ebc0acf1f33adb6568c9201c05fb6fc32339278 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 d8c8151..5aed971 100644
+index d71a6ae..f2adc82 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -220,7 +220,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

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

@@ -1,11 +1,11 @@
-From 96bd30115104c0b451aa8a27327cca9720d245fe Mon Sep 17 00:00:00 2001
+From 032862f35bc49a777f96526ddc16ed4a76ebbbce 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 5aed971..e8dab78 100644
+index f2adc82..9e1981f 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -27,7 +27,7 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
@@ -18,7 +18,7 @@ index 5aed971..e8dab78 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 ee4289d..3c2c3cc 100644
+index 772f85b..9ce0b2c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1400,6 +1400,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

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

@@ -1,4 +1,4 @@
-From d80d05b09d60f8a1356996dcb560b07a1ac1867b Mon Sep 17 00:00:00 2001
+From 44646ca39c85a899fb448778abfc792f3ed47074 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/0082-Fix-dispensing-bone-meal-not-having-the-correct-data.patch

@@ -1,4 +1,4 @@
-From 1f36a4752012204a8bffd4232cac0991ad1a4a38 Mon Sep 17 00:00:00 2001
+From 42dca1e7744e7f8512fce33e89561cb1649781b4 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/0083-Spam-Filter-Exclusions.patch

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

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

@@ -1,4 +1,4 @@
-From 5c461033875ead74b7ef1c83e6d6bc3e3938e347 Mon Sep 17 00:00:00 2001
+From 7876bfcc386b7b3074efca17e637ea94fdd318cb 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/0085-Add-support-for-fetching-hidden-players.patch

@@ -1,11 +1,11 @@
-From 37aa0f5a81539bf9f4f8a3e49c6fa9a2f94d7898 Mon Sep 17 00:00:00 2001
+From 337ce9d7fdd7c82ffc7d12ade48052a1cb0d33bd 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 3c2c3cc..b28ec72 100644
+index 9ce0b2c..025bae0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1406,6 +1406,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

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

@@ -1,4 +1,4 @@
-From 747cc64e39ce11f96da45d416f1c295faa96c062 Mon Sep 17 00:00:00 2001
+From bee36607ea787ec6b740203cd17ce37b6a4a1867 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

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

@@ -1,11 +1,11 @@
-From 1a3cc56937c40ebe7fe5e3eb4e5651926df75895 Mon Sep 17 00:00:00 2001
+From 33c6167b658c1117a98649a913171aa17aca59bc 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 b28ec72..5480607 100644
+index 025bae0..fa357a0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1060,6 +1060,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

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

@@ -1,11 +1,11 @@
-From 76e657bb3daaf6b9eb389359a4efff083b37ba9d Mon Sep 17 00:00:00 2001
+From 3ba05832baee3fa46aa3bd7fc0c1ea6749ee1bcd 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
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a5499a1..5fc0e28 100644
+index 5c1cfaa..6ea7371 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -316,8 +316,11 @@ public final class CraftServer implements Server {

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

@@ -1,4 +1,4 @@
-From f0f17b0b2d63657ccda01f0264b204842c133bac Mon Sep 17 00:00:00 2001
+From 4789c7aa0aa7bf5fa76926cc220ad8f5bf365fba 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.

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

@@ -1,4 +1,4 @@
-From fe41f463af26484364345384b92b29aa6a18cb79 Mon Sep 17 00:00:00 2001
+From 150a164b901fd244e7ad73620606cafbda33c827 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
@@ -39,7 +39,7 @@ index 5bda5d3..1bbce9b 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 d61c1de..2322a96 100644
+index 4399a8b..69cb88d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1390,6 +1390,22 @@ public class CraftWorld implements World {
@@ -82,5 +82,5 @@ index 243e8e5..0bacc83 100644
      
      @Override
 -- 
-1.9.1
+2.1.0
 

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

@@ -1,4 +1,4 @@
-From 0b5adb4006976878c7a02dafb0ca526d7f1345e6 Mon Sep 17 00:00:00 2001
+From 77a5cf1c8925e6a9164edf05ad18bed503bad889 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/0092-Prevent-hoppers-from-loading-chunks.patch

@@ -1,4 +1,4 @@
-From f8af922bed5a2a888eaa3f9277f901902095242b Mon Sep 17 00:00:00 2001
+From 7f28430e7fcfc32971292cf00e3e2ca3a7715864 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/0093-Guard-Entity-List.patch

@@ -1,4 +1,4 @@
-From 95eac1a2131a07f4e646b0b8125bf2bf9b847859 Mon Sep 17 00:00:00 2001
+From 935d0bc0c946531cd072766473d98da86fd96dab 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/0094-Fix-ConcurrentModificationException-while-being-idle.patch

@@ -1,4 +1,4 @@
-From 31ece3ba767483b20a8bdcb00575610aff2f84f1 Mon Sep 17 00:00:00 2001
+From a72fb8ae78381284e1c403ecfa4bad5cdba599f5 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/0095-Cancellable-WitherSkull-potion-effect.patch

@@ -1,4 +1,4 @@
-From 2f9302529541e21254ecb789ba18f5d8b086740a Mon Sep 17 00:00:00 2001
+From 914a28e95c461823cb67d2a17af9eb4c196e03b4 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/0096-Descriptive-kick-reasons-instead-of-Nope.patch

@@ -1,4 +1,4 @@
-From 99c9a03e1bfae144c9227a0eae7ef8f0d57c0181 Mon Sep 17 00:00:00 2001
+From 249ebced4d43ef51b949e96c58754b397a8bd30b 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!

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

@@ -1,4 +1,4 @@
-From 058986f4916b16d6a9782c11a4e65c6fb728f38e Mon Sep 17 00:00:00 2001
+From 1a90881208e173ebf04bae369abc7ea8582125ee 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/0098-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch

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

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

@@ -1,4 +1,4 @@
-From 3ef3940c97e509ea36aba015fa9ae06fb6a5816b Mon Sep 17 00:00:00 2001
+From e31a5620ebb043dda0cfd32b5843cad3b899b18d 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/0100-Add-Conversion-Message.patch

@@ -1,4 +1,4 @@
-From 6439f109829d49df5f1333f902f106fb825da0ac Mon Sep 17 00:00:00 2001
+From 918134f27b1f746e81e2997713a8b5fe15900a65 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/0101-Properly-cancel-fishing-event.-Fixes-BUKKIT-5396.patch

@@ -1,4 +1,4 @@
-From dd287f8fcf8890ca9fcb4d6f63910f6796598a55 Mon Sep 17 00:00:00 2001
+From c8c38ce460b6744644198befda735342903f4569 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/0102-Print-Stack-on-InternalException.patch

@@ -1,4 +1,4 @@
-From 194512f5111d68e86abf4576085ef117b21a60e1 Mon Sep 17 00:00:00 2001
+From f661c7f0d51e0c9e15171e04835e25bfad1854e9 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/0103-Use-Offline-Player-Data-Once-if-Required.patch

@@ -1,4 +1,4 @@
-From 7ec105c3413b800da05393ab7a8cbdd3371f23e7 Mon Sep 17 00:00:00 2001
+From e54784b5964d42ad5916392df7b3690453fdc72b 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/0104-Use-Provided-Case-for-Non-Existent-Offline-Players.patch

@@ -1,4 +1,4 @@
-From b45417ba03a2fcdcb4715c1d1621b33c97755f3a Mon Sep 17 00:00:00 2001
+From b9adeb7795d6a4a812500926f7ddc3a15e6a3f1c 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/0105-Check-for-blank-OfflinePlayer-Names.patch

@@ -1,4 +1,4 @@
-From caf26ee83d97c36f4985c62cde9b5e78d1a2d99f Mon Sep 17 00:00:00 2001
+From 950e3337bc6c28df70bf4d002c1e24b9285af974 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/0106-Fix-Player-Banning.patch

@@ -1,4 +1,4 @@
-From cebe57f8332d43c0da78e8dd987818932315232d Mon Sep 17 00:00:00 2001
+From dbdbb73a4331127d401976048223b0d16e44d652 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/0107-Fix-ban-expire-dates.patch

@@ -1,4 +1,4 @@
-From 7e0e2dfd75e5e36659d206ad7bf898d903c567af Mon Sep 17 00:00:00 2001
+From 36016416a0a5edaff822c48bd8ca65995c1356b3 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/0108-Correct-Ban-Expiration.patch

@@ -1,11 +1,11 @@
-From a12d6ee8c2c4b41cc287f1a70803039bd946c313 Mon Sep 17 00:00:00 2001
+From ea0e49d75047cd85378ee165e672e730230fca6e 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
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index f0d1ada..82dd862 100644
+index fdb4b3c..7eb2077 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -376,7 +376,7 @@ public abstract class PlayerList {

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

@@ -1,4 +1,4 @@
-From 125ef0300ef92639807b91346c45d8d15524880b Mon Sep 17 00:00:00 2001
+From 8f026ef54f0c0a2405847ed1c339608db7f3cef1 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
@@ -27,5 +27,5 @@ index b3ad7e7..50e9292 100644
              s = NameReferencingFileConverter.a(s1);
          }
 -- 
-1.9.1
+2.1.0
 

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

@@ -1,4 +1,4 @@
-From af4cca3fdb0ff0af9e22638500b9cf24f39d6f9c Mon Sep 17 00:00:00 2001
+From 8ded9f9c68456073e799c3fa14e154d97f54bc9e 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/0111-Add-Score.isScoreSet-Z-API.patch

@@ -1,4 +1,4 @@
-From 127d0ce6119ec93e148c623942ce97fb3bafa33e Mon Sep 17 00:00:00 2001
+From 4a763c1c1d2738c2dedb9f6a0abf2a91497c64f4 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/0112-Log-null-TileEntity-Owner.patch

@@ -1,4 +1,4 @@
-From 53fd961aebd1c269c92d4617c3ec81825e26f3cf Mon Sep 17 00:00:00 2001
+From a24fe76ab7d9e3910e58f94f0ea7de0803deeb8d 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/0113-Don-t-special-case-invalid-usernames-for-UUIDs.patch

@@ -1,4 +1,4 @@
-From 57caebbf7c48ff8546e7933ea900bf126c26a421 Mon Sep 17 00:00:00 2001
+From d1ca208fbc173a88da5937f3e0d7662f57b682b1 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/0114-Convert-player-skulls-async.patch

@@ -1,4 +1,4 @@
-From a2bf85035fac8dc52b525d34579a57704bd9fa09 Mon Sep 17 00:00:00 2001
+From d5325dcdcba34cde7a9090c257cec487ee0b0f82 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
@@ -185,7 +185,7 @@ index 889ae50..6c33c2d 100644
      public int getSkullType() {
          return this.a;
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-index 1d30e5e..e84f24c 100644
+index 89912bc..848a6f9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 @@ -45,13 +45,27 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {

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

@@ -1,4 +1,4 @@
-From 8debbd894791191ca811c1ca5b1627e43ff94da6 Mon Sep 17 00:00:00 2001
+From 84a41be61dd6e25098b1b068f940cb906b5c3c86 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/0116-Check-Skull-canPlace.patch

@@ -1,4 +1,4 @@
-From 56989d31da36775b31523b8aeaf811262bcef094 Mon Sep 17 00:00:00 2001
+From cd3bba3c509c48804f8023b4f1814036d2191f60 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/0117-Don-t-let-trees-replace-any-block.patch

@@ -1,4 +1,4 @@
-From 614ea6fac94e4fa3d2e901bbf41c81907347fe47 Mon Sep 17 00:00:00 2001
+From 0bd576afabb235fd21e0fca91cfbf2e17f207f85 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/0118-Fix-race-condition-that-could-kill-connections-befor.patch

@@ -1,4 +1,4 @@
-From 3b15cce121285a0a63220940aa09ba145ba79504 Mon Sep 17 00:00:00 2001
+From e1cf9a1d3b8c3671b7ed6fba4c12747d616b4bbe 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/0119-Configurable-UserCache-cap.patch

@@ -1,4 +1,4 @@
-From 7ca132b491e99801dd2338c9879afdae06b3af3f Mon Sep 17 00:00:00 2001
+From 9abff011aa9a02093f0a0e8bd30f5430ba1f46a6 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/0120-Implement-PlayerSpawnLocationEvent.patch

@@ -1,11 +1,11 @@
-From a8a8ff64e451fbc06f035c5dbe37755bf9620c6f Mon Sep 17 00:00:00 2001
+From 7589fd59a8aeaa4009ed2c4c32cea836df1cf6d4 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.
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 82dd862..34ee440 100644
+index 7eb2077..3fabad4 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -36,6 +36,7 @@ import org.bukkit.event.player.PlayerQuitEvent;

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

@@ -1,4 +1,4 @@
-From 1d7b2b965435427e441c24abdb23fc18979c2a15 Mon Sep 17 00:00:00 2001
+From 288295b6f6a691d3b51657f133543c0fb5157a19 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/0122-Process-conversation-input-on-the-main-thread.-Fixes.patch

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

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

@@ -1,4 +1,4 @@
-From 3ce8d2cb840f6b427b34c1eb5b14157d5c692b91 Mon Sep 17 00:00:00 2001
+From 556a25689182865a8cebb5514d95b5005d7de075 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

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

@@ -1,4 +1,4 @@
-From c73ddaa7d7bcd47fa46a513343b34e2d624d4c06 Mon Sep 17 00:00:00 2001
+From 68ac48bb1ce021e3a509bba3007a6f544001ae37 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/0125-Add-damager-to-the-unhandled-error.patch

@@ -1,11 +1,11 @@
-From f436dce04a87722898533c5fe78cefcd00e3bad4 Mon Sep 17 00:00:00 2001
+From 9d3e9cca67527418501695d316010dce9bd474aa 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 982e45c..2f3ff86 100644
+index 96c7344..74e0930 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -184,7 +184,7 @@ public class CraftEventFactory {

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

@@ -1,4 +1,4 @@
-From acb38c2604b45df232ba1a71db38acb806268ee7 Mon Sep 17 00:00:00 2001
+From 0eedd147dd89dedfc6f69ec18f96d15cb9e66dd2 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

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

@@ -1,4 +1,4 @@
-From 809c0879c594cde6164d9614324493204ef4a700 Mon Sep 17 00:00:00 2001
+From 165d4180a99f702fead7173ab0dbdd12c3531941 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

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

@@ -1,4 +1,4 @@
-From ef07b1f5de9476274a7a491bd59ac0a21948fd24 Mon Sep 17 00:00:00 2001
+From dd7a63f66a09de45aa0921b26487bdb330959b00 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/0129-Further-Seed-Customisation.patch

@@ -1,4 +1,4 @@
-From e58fbbf29dd242c7977aa6ea455adf7371bbba29 Mon Sep 17 00:00:00 2001
+From 09948e6d12a27ec08ffd5539195e2235a7f0a861 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

CraftBukkit-Patches/0130-Disable-ResourceLeakDetector.patch

@@ -1,4 +1,4 @@
-From e2d5da82f26b1bcb5f8ebf9a977f52c7da4ef2ff Mon Sep 17 00:00:00 2001
+From 5cea823363022d0aefdf95ffbf3f00475bb66eb7 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,7 +6,7 @@ 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 28c91cd..0c02747 100644
+index f13be48..5736d88 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -126,6 +126,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs

CraftBukkit-Patches/0131-Add-More-Information-to-session.lock-Errors.patch

@@ -1,4 +1,4 @@
-From 0c830ff1ed96046b3eeb471c8bc499dcd9be0e1b Mon Sep 17 00:00:00 2001
+From 20b7189fa3d6b4b03fb762f38eb65d663579a92a Mon Sep 17 00:00:00 2001
 From: Suddenly <suddenly@suddenly.coffee>
 Date: Sat, 5 Jul 2014 16:56:44 +0100
 Subject: [PATCH] Add More Information to session.lock Errors

CraftBukkit-Patches/0132-Safer-JSON-Loading.patch

@@ -1,4 +1,4 @@
-From f3edd8e4f0b1fb7cec4651daf41dd10e47822208 Mon Sep 17 00:00:00 2001
+From d3e9d7ccdbd3efa5dc011fe3cf6d2196ef34ed3d Mon Sep 17 00:00:00 2001
 From: Suddenly <suddenly@suddenly.coffee>
 Date: Tue, 8 Jul 2014 09:44:18 +1000
 Subject: [PATCH] Safer JSON Loading

CraftBukkit-Patches/0133-Fix-Slow-Loading-Libraries.patch

@@ -1,4 +1,4 @@
-From dc9b26361326393f57a292c0d99070a40f1f790d Mon Sep 17 00:00:00 2001
+From 2153f4bda07f4539d4d8bdfcde0cf9744eb336d1 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 8 Jul 2014 20:27:52 +1000
 Subject: [PATCH] Fix Slow "Loading Libraries"
@@ -16,5 +16,5 @@ index 36eff85..08d68aa 100644
          <Console name="WINDOWS_COMPAT" target="SYSTEM_OUT"></Console>
          <Queue name="TerminalConsole">
 -- 
-1.9.4.msysgit.2
+2.1.0
 

CraftBukkit-Patches/0134-Add-CommandLine-EULA-Flag.patch

@@ -1,4 +1,4 @@
-From 79775244d438c9a01ec9fb4ba2e66a8e65c9de27 Mon Sep 17 00:00:00 2001
+From 5e182b99e5a1036f0ee2e1089aaf173e11663fbc Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 9 Jul 2014 10:35:44 +1000
 Subject: [PATCH] Add CommandLine EULA Flag

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

@@ -1,4 +1,4 @@
-From 0c25a0a897497ccfd8379facda3ef6ca1a3d30ac Mon Sep 17 00:00:00 2001
+From 8442fb194cbc0b09e6425fb723093f269c56cc71 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

CraftBukkit-Patches/0136-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch

@@ -1,4 +1,4 @@
-From 7a40b9cd24db374ee1139d61ac092f7e559aec18 Mon Sep 17 00:00:00 2001
+From 6fe9df94543eca771be60081d320e0709917b9ec Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Sat, 19 Jul 2014 12:49:48 +0100
 Subject: [PATCH] Don't spawn bonus ocelots when plugins spawn ocelots

CraftBukkit-Patches/0137-Prevent-a-crash-involving-attributes.patch

@@ -1,11 +1,11 @@
-From a19334167ae4751278c8d15b3f55027e25b5db46 Mon Sep 17 00:00:00 2001
+From ecaedca9c2f146ef8058c63b63ee67bc4d0f338a Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Sat, 19 Jul 2014 19:54:41 +0100
 Subject: [PATCH] Prevent a crash involving attributes
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5480607..d1f69dc 100644
+index fa357a0..8700b18 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1310,7 +1310,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

CraftBukkit-Patches/0138-Make-moved-wrongly-limit-configurable.patch

@@ -1,11 +1,11 @@
-From 3295048f09613aac6d7cafe007e8304c2271afe7 Mon Sep 17 00:00:00 2001
+From d2f42b7cb24bbac7b4ce2962b1483cc89a9e09fd Mon Sep 17 00:00:00 2001
 From: Jonas Konrad <me@yawk.at>
 Date: Fri, 4 Jul 2014 23:03:13 +0200
 Subject: [PATCH] Make "moved wrongly" limit configurable
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index b266f6a..73477ee 100644
+index 2fa99b3..4fe4d23 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -406,7 +406,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList

CraftBukkit-Patches/0139-Fix-Null-Tile-Entity-Worlds.patch

@@ -1,4 +1,4 @@
-From f3a54462ee2f5638daa4c1d62e6818db1584d6bb Mon Sep 17 00:00:00 2001
+From e9a303ebaf13995b20ead2771b20dec00341fd57 Mon Sep 17 00:00:00 2001
 From: "Evan A. Haskell" <eah2119@gmail.com>
 Date: Thu, 26 Jun 2014 18:37:29 -0400
 Subject: [PATCH] Fix Null Tile Entity Worlds

CraftBukkit-Patches/0140-Make-moved-too-quickly-limit-configurable.patch

@@ -1,11 +1,11 @@
-From 453d7cec49ec898286b82e4d4467ffb8d733bea8 Mon Sep 17 00:00:00 2001
+From c5b0d675076a007370cb7c9ffcaa073d8bca02ff Mon Sep 17 00:00:00 2001
 From: Jonas Konrad <me@yawk.at>
 Date: Tue, 22 Jul 2014 15:59:01 +0200
 Subject: [PATCH] Make "moved too quickly" limit configurable
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 73477ee..abcb3cd 100644
+index 4fe4d23..c52f393 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -379,7 +379,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList

CraftBukkit-Patches/0141-Alternative-Hopper-Ticking.patch

@@ -1,4 +1,4 @@
-From cc94cf5d70dccd9b10203df3f4745b28527622e4 Mon Sep 17 00:00:00 2001
+From 6aa90b5cb0285c13e216be26c22266a73d9954e5 Mon Sep 17 00:00:00 2001
 From: "Evan A. Haskell" <eah2119@gmail.com>
 Date: Sat, 19 Apr 2014 16:58:26 -0400
 Subject: [PATCH] Alternative Hopper Ticking

CraftBukkit-Patches/0142-Apply-NBTReadLimiter-to-more-things.patch

@@ -1,4 +1,4 @@
-From 1ae1dcab1312a51a4975680980d63f3f9f2d9026 Mon Sep 17 00:00:00 2001
+From 13a105c2d5d3303b3f18d38892164b009cbf2d94 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 27 Jul 2014 20:46:04 +1000
 Subject: [PATCH] Apply NBTReadLimiter to more things.

CraftBukkit-Patches/0143-Allow-Attribute-Capping.patch

@@ -1,4 +1,4 @@
-From ecf4815c1b72c3c3821e0512fe2aadffb68f9c3a Mon Sep 17 00:00:00 2001
+From 822915d3021a078bcdd8cd4da07bc38e028e6007 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 28 Jul 2014 16:55:51 +1000
 Subject: [PATCH] Allow Attribute Capping.

CraftBukkit-Patches/0144-Add-an-option-for-a-global-cache-for-any-request-on-.patch

@@ -1,4 +1,4 @@
-From 94299797492bfd4863ea90793fd5e1deb0576323 Mon Sep 17 00:00:00 2001
+From 31e5a77c818e672e8263b4d9f2d0d53d7582a610 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Mon, 28 Jul 2014 11:42:11 +0100
 Subject: [PATCH] Add an option for a global cache for any request on Mojang's

CraftBukkit-Patches/0145-Only-fetch-an-online-UUID-in-online-mode.patch

@@ -1,4 +1,4 @@
-From da0947583dc1dbf478a1c04ab155cc3d64136e71 Mon Sep 17 00:00:00 2001
+From 678285211fb79a24f90e558dc7d3609aaf48629b Mon Sep 17 00:00:00 2001
 From: Maxim Van de Wynckel <maxim_vdw@hotmail.com>
 Date: Wed, 30 Jul 2014 01:19:51 +0200
 Subject: [PATCH] Only fetch an online UUID in online mode

CraftBukkit-Patches/0146-Filter-attribute-modifiers-which-cause-the-attribute.patch

@@ -1,4 +1,4 @@
-From 6782704edc90554ab8a70d93f6bec734b6aef1b6 Mon Sep 17 00:00:00 2001
+From 5c68e24ec033c5ccf8fc01f5a67b8fa4f991ae6d Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Thu, 31 Jul 2014 17:48:20 +0100
 Subject: [PATCH] Filter attribute modifiers which cause the attribute to go

CraftBukkit-Patches/0147-Plug-WorldMap-Memory-Leak.patch

@@ -1,4 +1,4 @@
-From eca4eae03ad12a47dd96990dd8e8951007a1ebf5 Mon Sep 17 00:00:00 2001
+From 8b7c751597dce2d36598db032ad6c388690580b4 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 8 Aug 2014 19:57:03 +1000
 Subject: [PATCH] Plug WorldMap Memory Leak

CraftBukkit-Patches/0148-Fix-Corrupted-Trapped-Chest.patch

@@ -1,4 +1,4 @@
-From 8a76d65baf9d9591f24ebf008f8e1d96d52ba63b Mon Sep 17 00:00:00 2001
+From 49d916f581ca0276a97008ac6b283fe29798c400 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 15 Aug 2014 00:56:41 -0400
 Subject: [PATCH] Fix Corrupted Trapped Chest
@@ -9,7 +9,7 @@ If a Trapped Chest gets its Tile Entity corrupted, it will crash the server ever
 This will now fix Trapped Chests too.
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index b5627c5..8b4278f 100644
+index c07f9f8..6dc3acf 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -114,7 +114,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {

CraftBukkit-Patches/0149-Remove-uneeded-validation.patch

@@ -1,4 +1,4 @@
-From 5f7fe70ea4af2e1d88a18470ad373e5fd5408067 Mon Sep 17 00:00:00 2001
+From 644da9219f1cd235ec131b6e1ccae82bc368579f Mon Sep 17 00:00:00 2001
 From: drXor <mcyoung@mit.edu>
 Date: Fri, 15 Aug 2014 18:11:09 -0400
 Subject: [PATCH] Remove uneeded validation

CraftBukkit-Patches/0150-Add-Hunger-Config-Values.patch

@@ -1,11 +1,11 @@
-From 1372f29a869fc690cf3f386b6e9dc09532200ddd Mon Sep 17 00:00:00 2001
+From 62ff9074424b7890c2652ea952274e9a55a07eb2 Mon Sep 17 00:00:00 2001
 From: lazertester <austin.techhead@gmail.com>
 Date: Sun, 17 Aug 2014 19:56:17 +1000
 Subject: [PATCH] Add Hunger Config Values
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index cf1cf37..4ccd4d5 100644
+index 9aa4f40..428d138 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1085,7 +1085,7 @@ public abstract class EntityHuman extends EntityLiving {

CraftBukkit-Patches/0151-Make-debug-logging-togglable.patch

@@ -1,4 +1,4 @@
-From 870475a482fbfbd4ca771d3be85630cff5427d59 Mon Sep 17 00:00:00 2001
+From 652806e771edc1eb342970dd19591615033d2de0 Mon Sep 17 00:00:00 2001
 From: Minecrell <dev@minecrell.net>
 Date: Sun, 17 Aug 2014 12:42:53 +0200
 Subject: [PATCH] Make debug logging togglable.

CraftBukkit-Patches/0152-Skip-invalid-enchants-in-CraftMetaItem.patch

@@ -1,4 +1,4 @@
-From 894fbe91ced2095c5776641ff178de748732fadf Mon Sep 17 00:00:00 2001
+From 4d8817313073f67b7d6b3d11be6583a29e8d99f4 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Tue, 19 Aug 2014 11:04:21 +0100
 Subject: [PATCH] Skip invalid enchants in CraftMetaItem

CraftBukkit-Patches/0153-Limit-TNT-Detonations-per-tick.patch

@@ -1,4 +1,4 @@
-From ff0f3082ea5c282ddcaa8411a95b5e4d4e813154 Mon Sep 17 00:00:00 2001
+From 4e7b4dc720d5db129e4b3ae1b3d0e1f1b9f6ee9e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Aug 2014 18:12:32 -0400
 Subject: [PATCH] Limit TNT Detonations per tick
@@ -19,7 +19,7 @@ index 98c8d26..3621faf 100644
          this.lastY = this.locY;
          this.lastZ = this.locZ;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 8b4278f..c6e8321 100644
+index 6dc3acf..3bba0ca4 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -575,6 +575,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {

CraftBukkit-Patches/0154-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch

@@ -1,4 +1,4 @@
-From 166fdc1c6f2728e48f35b4afc61039261bcb8350 Mon Sep 17 00:00:00 2001
+From 2105fb51c3a5fbe713f77053c687282cd8ec5bce Mon Sep 17 00:00:00 2001
 From: libraryaddict <redwarfare@live.com>
 Date: Fri, 22 Aug 2014 05:35:16 -0400
 Subject: [PATCH] Added isUnbreakable and setUnbreakable to ItemMeta

CraftBukkit-Patches/0155-Configurable-Hanging-Tick.patch

@@ -1,4 +1,4 @@
-From a3fc80cb344d91515b2f514b689063f83721b43b Mon Sep 17 00:00:00 2001
+From 30056d906e60056a77004d2fedd30b88a0db535a Mon Sep 17 00:00:00 2001
 From: drXor <mcyoung@mit.edu>
 Date: Sat, 9 Aug 2014 13:56:51 -0400
 Subject: [PATCH] Configurable Hanging Tick

CraftBukkit-Patches/0156-Fix-Some-Memory-Leaks.patch

@@ -1,4 +1,4 @@
-From a83fd0eb5340c61459f0b70103cd0576375a182e Mon Sep 17 00:00:00 2001
+From 0321975647074066afa874d8cc699bfea29e59db Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 21 Sep 2014 10:06:01 +1000
 Subject: [PATCH] Fix Some Memory Leaks

CraftBukkit-Patches/0157-Refactor-ItemDoor-Place.patch

@@ -1,4 +1,4 @@
-From 93d8b11854923443d2d26adbf395e5ade019c98c Mon Sep 17 00:00:00 2001
+From 8194ba2fe338dc1fc917238168835b164c393441 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 30 Sep 2014 21:43:15 +1000
 Subject: [PATCH] Refactor ItemDoor Place

CraftBukkit-Patches/0158-Don-t-Fire-InventoryCloseEvent-Unless-Required.patch

@@ -1,11 +1,11 @@
-From 1cb3de476b6b443341ad6e39987df680888a55fc Mon Sep 17 00:00:00 2001
+From da41e13718b9fae1321529093009ccf57cc288a6 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 30 Sep 2014 21:49:10 +1000
 Subject: [PATCH] Don't Fire InventoryCloseEvent Unless Required
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 2f3ff86..5657e00 100644
+index 74e0930..efd247c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -828,6 +828,7 @@ public class CraftEventFactory {