Update to Minecraft 1.14

Bukkit-Patches/0001-POM-Changes.patch

@@ -1,11 +1,11 @@
-From 434f93ab2f3612ac47797f0ae6e5e27b688b6b7b Mon Sep 17 00:00:00 2001
+From af9a2293117077fb8ad389da49ccd86d4506ecb2 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 10:36:24 +1000
 Subject: [PATCH] POM Changes
 
 
 diff --git a/pom.xml b/pom.xml
-index 143a6969..9bf38539 100644
+index d5b950fc..733d1855 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,14 +3,14 @@
@@ -16,7 +16,7 @@ index 143a6969..9bf38539 100644
 -    <artifactId>bukkit</artifactId>
 +    <groupId>org.spigotmc</groupId>
 +    <artifactId>spigot-api</artifactId>
-     <version>1.14-pre5-SNAPSHOT</version>
+     <version>1.14-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>Bukkit</name>

Bukkit-Patches/0002-Skeleton-API-Implementations.patch

@@ -1,4 +1,4 @@
-From ff96787f41e0d639e8319270fed968871239063d Mon Sep 17 00:00:00 2001
+From df38b8d57156918a024c6562de066a8ba21a56c8 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 15 May 2017 15:16:15 +1000
 Subject: [PATCH] Skeleton API Implementations

Bukkit-Patches/0003-Spigot-Timings.patch

@@ -1,4 +1,4 @@
-From 696b7a96ef5ba44f676baaef2fd65d0cdc9d8971 Mon Sep 17 00:00:00 2001
+From f05fd6b6fd43adab031a59f9f58215100b91220c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 2 Jun 2013 10:42:57 +1000
 Subject: [PATCH] Spigot Timings

Bukkit-Patches/0004-BungeeCord-Support.patch

@@ -1,4 +1,4 @@
-From 52df5eb64200049df8e670897057792a66437273 Mon Sep 17 00:00:00 2001
+From bdfc6d00835ce0cc9a3864efbc3f74bf3e61a964 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:20:49 +1000
 Subject: [PATCH] BungeeCord Support

Bukkit-Patches/0005-Add-Arrow-API.patch

@@ -1,4 +1,4 @@
-From a59d0082eb30b0ed6d2b20a5fce119174d1cfade Mon Sep 17 00:00:00 2001
+From d84d4b89f78871dd4c7c32aa21bd94d6217d437d Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:08:24 +1000
 Subject: [PATCH] Add Arrow API

Bukkit-Patches/0006-Define-SpawnerSpawnEvent.patch

@@ -1,4 +1,4 @@
-From b5228329ca1cdb04e4c2f2c7c2cd901ed33ca4ee Mon Sep 17 00:00:00 2001
+From c72a073eea6ffc094d7bd613d60afe5a65f40442 Mon Sep 17 00:00:00 2001
 From: Andy Shulman <andy.shulman@hotmail.com>
 Date: Mon, 15 Apr 2013 20:06:01 -0500
 Subject: [PATCH] Define SpawnerSpawnEvent

Bukkit-Patches/0007-Entity-Mount-and-Dismount-Events.patch

@@ -1,4 +1,4 @@
-From 976b85de79749f3972b6dea4016c8e2d419a8c6c Mon Sep 17 00:00:00 2001
+From bee29edbfaf79940743408fde324be113e73c933 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 2 Jul 2013 20:32:53 +1000
 Subject: [PATCH] Entity Mount and Dismount Events

Bukkit-Patches/0008-Player-Collision-API.patch

@@ -1,4 +1,4 @@
-From 770c760fa8b5a12d1441eb5c5beda19a06c499eb Mon Sep 17 00:00:00 2001
+From bcccaac2084dfd713b39c3f4cf1862b0e1392ed7 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 3 Aug 2013 19:20:50 +1000
 Subject: [PATCH] Player Collision API

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

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

Bukkit-Patches/0010-Add-respawn-API.patch

@@ -1,4 +1,4 @@
-From 642acac96be4941440ee7dfd87287caedfe947df Mon Sep 17 00:00:00 2001
+From fb73f892332c67c972601c5d94494cbf9944ba1d Mon Sep 17 00:00:00 2001
 From: ninja- <xninja@openmailbox.org>
 Date: Tue, 8 Oct 2013 14:35:58 +0200
 Subject: [PATCH] Add respawn API.

Bukkit-Patches/0011-Implement-Locale-Getter-for-Players.patch

@@ -1,4 +1,4 @@
-From 17cfab158f6329754ab156478a809a23563f97d6 Mon Sep 17 00:00:00 2001
+From 57bfd5812f387f6e41c1042d6768c6f6cd683759 Mon Sep 17 00:00:00 2001
 From: Smove <jan@lavasurvival.net>
 Date: Sat, 1 Feb 2014 18:10:49 +1100
 Subject: [PATCH] Implement Locale Getter for Players

Bukkit-Patches/0012-Add-support-for-fetching-hidden-players.patch

@@ -1,4 +1,4 @@
-From 00cff735d8231ab119dc65b559761dca020e0812 Mon Sep 17 00:00:00 2001
+From 4b4e33cc1689ccab82a8d19a51424ebe3a38906f Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Sun, 9 Feb 2014 14:02:11 -0500
 Subject: [PATCH] Add support for fetching hidden players

Bukkit-Patches/0013-Silenceable-Lightning-API.patch

@@ -1,4 +1,4 @@
-From d8ec28c2057ffe1d977337c40cd207def3d87598 Mon Sep 17 00:00:00 2001
+From eed8dc1eb74b10a2cf4aa155228f987da1eda2f8 Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Sun, 23 Feb 2014 16:16:29 -0400
 Subject: [PATCH] Silenceable Lightning API

Bukkit-Patches/0014-Remove-deprecation-on-some-player-lookup-methods.patch

@@ -1,4 +1,4 @@
-From f7de6b08e6fed752784d4da7321145e3b3cf6f01 Mon Sep 17 00:00:00 2001
+From 9c7518b96b89eee55c47bf918f8fca8acd6b5f4d Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 30 Mar 2014 15:58:22 +1100
 Subject: [PATCH] Remove deprecation on some player lookup methods

Bukkit-Patches/0015-Add-PlayerSpawnLocationEvent.patch

@@ -1,4 +1,4 @@
-From 3f4ead1bfc737bbe1131bd798eb459049dc6fbaa Mon Sep 17 00:00:00 2001
+From 6ffa24232f8a672f2e6c5e332796748a0df84b82 Mon Sep 17 00:00:00 2001
 From: ninja <xninja@openmailbox.org>
 Date: Tue, 8 Apr 2014 14:01:32 +0200
 Subject: [PATCH] Add PlayerSpawnLocationEvent.

Bukkit-Patches/0016-Undeprecate-Player-updateInventory-V.patch

@@ -1,4 +1,4 @@
-From 95d0b5b4451f9a180624b096e563ec22573a3e54 Mon Sep 17 00:00:00 2001
+From 1df8e395586c3758ab30c103ed249f8cc19aef7f Mon Sep 17 00:00:00 2001
 From: drXor <mcyoung@mit.edu>
 Date: Wed, 23 Jul 2014 15:50:36 -0400
 Subject: [PATCH] Undeprecate Player#updateInventory()V

Bukkit-Patches/0017-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch

@@ -1,4 +1,4 @@
-From 87e42388589cd97292cb866298a2bf861897c64f Mon Sep 17 00:00:00 2001
+From 0039ea9132a267114288b2eeab97124b54ce86e4 Mon Sep 17 00:00:00 2001
 From: libraryaddict <redwarfare@live.com>
 Date: Fri, 22 Aug 2014 05:31:04 -0400
 Subject: [PATCH] Added isUnbreakable and setUnbreakable to ItemMeta

Bukkit-Patches/0018-BungeeCord-Chat-API.patch

@@ -1,11 +1,11 @@
-From fbef2ea9095314084753d99df93f5e1a0adb95e0 Mon Sep 17 00:00:00 2001
+From 66814d66b99c6fb8800f7cf62f9cf1a0d1152b5e Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 13 Dec 2014 02:59:14 +0100
 Subject: [PATCH] BungeeCord Chat API
 
 
 diff --git a/pom.xml b/pom.xml
-index 9bf38539..093a1376 100644
+index 733d1855..75681af7 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -71,6 +71,13 @@

Bukkit-Patches/0019-Add-restart-API.patch

@@ -1,4 +1,4 @@
-From fce2cb72649a9ad38452a94293f7c832d0487b1c Mon Sep 17 00:00:00 2001
+From bff608d9c39765f6912d621a7d57de3914d2c9fe Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 13 Jul 2015 19:10:15 +1000
 Subject: [PATCH] Add restart API.

CraftBukkit-Patches/0001-POM-Changes.patch

@@ -1,4 +1,4 @@
-From 11592378c348c6ce0b3719d66a4c57e1f836e2a6 Mon Sep 17 00:00:00 2001
+From 710311c863700b1131d21fb8a053f4f810ac0736 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 2 Jul 2013 13:07:39 +1000
 Subject: [PATCH] POM Changes
@@ -6,10 +6,10 @@ Subject: [PATCH] POM Changes
 Basic changes to the build system which mark the artifact as Spigot, and the necessary code changes to ensure proper functionality. Also disables the auto updater provided by CraftBukkit as it is useless to us.
 
 diff --git a/pom.xml b/pom.xml
-index 7da4913b..0995afa9 100644
+index 2d444b6a1..982ac22e8 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -1,12 +1,12 @@
+@@ -1,11 +1,11 @@
  <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
      <modelVersion>4.0.0</modelVersion>
@@ -18,14 +18,12 @@ index 7da4913b..0995afa9 100644
 +    <groupId>org.spigotmc</groupId>
 +    <artifactId>spigot</artifactId>
      <packaging>jar</packaging>
-     <version>1.14-pre5-SNAPSHOT</version>
+     <version>1.14-R0.1-SNAPSHOT</version>
 -    <name>CraftBukkit</name>
--    <url>http://www.bukkit.org</url>
 +    <name>Spigot</name>
-+    <url>http://www.spigotmc.org</url>
+     <url>https://www.spigotmc.org/</url>
  
      <properties>
-         <skipTests>true</skipTests>
 @@ -21,10 +21,17 @@
          <maven.compiler.target>1.8</maven.compiler.target>
      </properties>
@@ -86,7 +84,7 @@ index 7da4913b..0995afa9 100644
                              <Specification-Title>Bukkit</Specification-Title>
                              <Specification-Version>${api.version}</Specification-Version>
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-index f905d17b..93046379 100644
+index f905d17b6..93046379d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 @@ -11,7 +11,7 @@ public final class Versioning {

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

@@ -1,4 +1,4 @@
-From d7932f1c3176451241c9510ff6b6d1d08d9a5176 Mon Sep 17 00:00:00 2001
+From b89ac29c8c979b80634dbe9ab9ce4d9f22631d4f 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Skeleton API Implementations
 This contains the basic, empty implementations for some Spigot-API extensions. They are included early in the patching progress so that compilation will still succeed midway despite the APIs only being provided by subsequent patches.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 55a874f9..76c2d3f9 100644
+index 459bf23cc..b1d04af27 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1878,4 +1878,14 @@ public final class CraftServer implements Server {
@@ -25,7 +25,7 @@ index 55a874f9..76c2d3f9 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index be47811b..a4938dd5 100644
+index be47811b6..a4938dd57 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1930,4 +1930,15 @@ public class CraftWorld implements World {
@@ -45,7 +45,7 @@ index be47811b..a4938dd5 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java b/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java
-index 477e9209..ce2c5c38 100644
+index 477e92096..ce2c5c38c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java
 @@ -122,4 +122,11 @@ public class ProxiedNativeCommandSender implements ProxiedCommandSender {
@@ -61,7 +61,7 @@ index 477e9209..ce2c5c38 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java b/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
-index 3dc333f3..8668d149 100644
+index 3dc333f32..8668d149f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
 @@ -67,4 +67,16 @@ public abstract class ServerCommandSender implements CommandSender {
@@ -82,7 +82,7 @@ index 3dc333f3..8668d149 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
-index 19ddd86d..743463db 100644
+index 19ddd86d3..743463db2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
 @@ -105,4 +105,15 @@ public class CraftArrow extends AbstractProjectile implements Arrow {
@@ -102,7 +102,7 @@ index 19ddd86d..743463db 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 c0ae544c..6c2f24fb 100644
+index c0ae544c2..6c2f24fbc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -910,4 +910,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -122,7 +122,7 @@ index c0ae544c..6c2f24fb 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
-index 64e346d8..194d830e 100644
+index 64e346d84..194d830e1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
 @@ -27,4 +27,15 @@ public class CraftLightningStrike extends CraftEntity implements LightningStrike
@@ -142,7 +142,7 @@ index 64e346d8..194d830e 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 5a1b6c3d..e3d006fa 100644
+index 5a1b6c3dc..e3d006fa2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1636,4 +1636,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -162,7 +162,7 @@ index 5a1b6c3d..e3d006fa 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
-index 5e3cc48f..d042ad6e 100644
+index 5e3cc48fc..d042ad6e6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 @@ -339,4 +339,14 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
@@ -181,7 +181,7 @@ index 5e3cc48f..d042ad6e 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index c1b34377..fa49533c 100644
+index 1dc988f69..57efcb6d1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -1383,4 +1383,16 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {

CraftBukkit-Patches/0003-mc-dev-imports.patch

@@ -1,4 +1,4 @@
-From 93bd47c69407d9d63cdba5128c50491fe301609c Mon Sep 17 00:00:00 2001
+From 22d68d51ffaf3b72443f3d2565176682792bdf3d Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 1 Dec 2013 15:10:48 +1100
 Subject: [PATCH] mc-dev imports
@@ -7,7 +7,7 @@ Imported files which are only modified by Spigot, not upstream. Files here shoul
 
 diff --git a/src/main/java/net/minecraft/server/AdvancementDataWorld.java b/src/main/java/net/minecraft/server/AdvancementDataWorld.java
 new file mode 100644
-index 00000000..8dde936e
+index 000000000..f3595b000
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/AdvancementDataWorld.java
 @@ -0,0 +1,115 @@
@@ -33,7 +33,7 @@ index 00000000..8dde936e
 +
 +public class AdvancementDataWorld implements IResourcePackListener {
 +
-+    private static final Logger c = LogManager.getLogger();
++    private static final Logger LOGGER = LogManager.getLogger();
 +    public static final Gson DESERIALIZER = (new GsonBuilder()).registerTypeHierarchyAdapter(Advancement.SerializedAdvancement.class, (com.google.gson.JsonDeserializer) (jsonelement, type, jsondeserializationcontext) -> {
 +        JsonObject jsonobject = ChatDeserializer.m(jsonelement, "advancement");
 +
@@ -65,7 +65,7 @@ index 00000000..8dde936e
 +                    Advancement.SerializedAdvancement advancement_serializedadvancement = (Advancement.SerializedAdvancement) ChatDeserializer.a(AdvancementDataWorld.DESERIALIZER, IOUtils.toString(iresource.b(), StandardCharsets.UTF_8), Advancement.SerializedAdvancement.class);
 +
 +                    if (advancement_serializedadvancement == null) {
-+                        AdvancementDataWorld.c.error("Couldn't load custom advancement {} from {} as it's empty or null", minecraftkey1, minecraftkey);
++                        AdvancementDataWorld.LOGGER.error("Couldn't load custom advancement {} from {} as it's empty or null", minecraftkey1, minecraftkey);
 +                    } else {
 +                        map.put(minecraftkey1, advancement_serializedadvancement);
 +                    }
@@ -87,10 +87,10 @@ index 00000000..8dde936e
 +
 +                }
 +            } catch (IllegalArgumentException | ResourceKeyInvalidException | JsonParseException jsonparseexception) {
-+                AdvancementDataWorld.c.error("Parsing error loading custom advancement {}: {}", minecraftkey1, jsonparseexception.getMessage());
++                AdvancementDataWorld.LOGGER.error("Parsing error loading custom advancement {}: {}", minecraftkey1, jsonparseexception.getMessage());
 +                this.f = true;
 +            } catch (IOException ioexception) {
-+                AdvancementDataWorld.c.error("Couldn't read custom advancement {} from {}", minecraftkey1, minecraftkey, ioexception);
++                AdvancementDataWorld.LOGGER.error("Couldn't read custom advancement {} from {}", minecraftkey1, minecraftkey, ioexception);
 +                this.f = true;
 +            }
 +        }
@@ -128,7 +128,7 @@ index 00000000..8dde936e
 +}
 diff --git a/src/main/java/net/minecraft/server/ChunkGenerator.java b/src/main/java/net/minecraft/server/ChunkGenerator.java
 new file mode 100644
-index 00000000..cea5166a
+index 000000000..cea5166a8
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/ChunkGenerator.java
 @@ -0,0 +1,199 @@
@@ -333,7 +333,7 @@ index 00000000..cea5166a
 +}
 diff --git a/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java b/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java
 new file mode 100644
-index 00000000..4500327a
+index 000000000..4500327ac
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java
 @@ -0,0 +1,428 @@
@@ -767,7 +767,7 @@ index 00000000..4500327a
 +}
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 new file mode 100644
-index 00000000..30f226e9
+index 000000000..b3c76c9af
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -0,0 +1,530 @@
@@ -791,7 +791,7 @@ index 00000000..30f226e9
 +
 +public class ChunkRegionLoader {
 +
-+    private static final Logger a = LogManager.getLogger();
++    private static final Logger LOGGER = LogManager.getLogger();
 +
 +    public static ProtoChunk loadChunk(World world, DefinedStructureManager definedstructuremanager, VillagePlace villageplace, ChunkCoordIntPair chunkcoordintpair, NBTTagCompound nbttagcompound) {
 +        ChunkGenerator<?> chunkgenerator = world.getChunkProvider().getChunkGenerator();
@@ -800,7 +800,7 @@ index 00000000..30f226e9
 +        ChunkCoordIntPair chunkcoordintpair1 = new ChunkCoordIntPair(nbttagcompound1.getInt("xPos"), nbttagcompound1.getInt("zPos"));
 +
 +        if (!Objects.equals(chunkcoordintpair, chunkcoordintpair1)) {
-+            ChunkRegionLoader.a.error("Chunk file at {} is in the wrong location; relocating. (Expected {}, got {})", chunkcoordintpair, chunkcoordintpair, chunkcoordintpair1);
++            ChunkRegionLoader.LOGGER.error("Chunk file at {} is in the wrong location; relocating. (Expected {}, got {})", chunkcoordintpair, chunkcoordintpair, chunkcoordintpair1);
 +        }
 +
 +        BiomeBase[] abiomebase = new BiomeBase[256];
@@ -1303,7 +1303,7 @@ index 00000000..30f226e9
 +}
 diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
 new file mode 100644
-index 00000000..345f798a
+index 000000000..345f798a7
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/EntitySquid.java
 @@ -0,0 +1,275 @@
@@ -1584,7 +1584,7 @@ index 00000000..345f798a
 +}
 diff --git a/src/main/java/net/minecraft/server/GameProfileBanEntry.java b/src/main/java/net/minecraft/server/GameProfileBanEntry.java
 new file mode 100644
-index 00000000..0cc70104
+index 000000000..0cc701042
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/GameProfileBanEntry.java
 @@ -0,0 +1,57 @@
@@ -1647,7 +1647,7 @@ index 00000000..0cc70104
 +}
 diff --git a/src/main/java/net/minecraft/server/GenericAttributes.java b/src/main/java/net/minecraft/server/GenericAttributes.java
 new file mode 100644
-index 00000000..76ca8b07
+index 000000000..589af605b
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/GenericAttributes.java
 @@ -0,0 +1,123 @@
@@ -1662,7 +1662,7 @@ index 00000000..76ca8b07
 +
 +public class GenericAttributes {
 +
-+    private static final Logger l = LogManager.getLogger();
++    private static final Logger LOGGER = LogManager.getLogger();
 +    public static final IAttribute MAX_HEALTH = (new AttributeRanged((IAttribute) null, "generic.maxHealth", 20.0D, 0.0D, 1024.0D)).a("Max Health").a(true);
 +    public static final IAttribute FOLLOW_RANGE = (new AttributeRanged((IAttribute) null, "generic.followRange", 32.0D, 0.0D, 2048.0D)).a("Follow Range");
 +    public static final IAttribute KNOCKBACK_RESISTANCE = (new AttributeRanged((IAttribute) null, "generic.knockbackResistance", 0.0D, 0.0D, 1.0D)).a("Knockback Resistance");
@@ -1730,7 +1730,7 @@ index 00000000..76ca8b07
 +            AttributeInstance attributeinstance = attributemapbase.a(nbttagcompound.getString("Name"));
 +
 +            if (attributeinstance == null) {
-+                GenericAttributes.l.warn("Ignoring unknown attribute '{}'", nbttagcompound.getString("Name"));
++                GenericAttributes.LOGGER.warn("Ignoring unknown attribute '{}'", nbttagcompound.getString("Name"));
 +            } else {
 +                a(attributeinstance, nbttagcompound);
 +            }
@@ -1769,14 +1769,14 @@ index 00000000..76ca8b07
 +
 +            return new AttributeModifier(uuid, nbttagcompound.getString("Name"), nbttagcompound.getDouble("Amount"), attributemodifier_operation);
 +        } catch (Exception exception) {
-+            GenericAttributes.l.warn("Unable to create attribute: {}", exception.getMessage());
++            GenericAttributes.LOGGER.warn("Unable to create attribute: {}", exception.getMessage());
 +            return null;
 +        }
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/ItemDebugStick.java b/src/main/java/net/minecraft/server/ItemDebugStick.java
 new file mode 100644
-index 00000000..a8a647d5
+index 000000000..a8a647d5d
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/ItemDebugStick.java
 @@ -0,0 +1,85 @@
@@ -1867,7 +1867,7 @@ index 00000000..a8a647d5
 +}
 diff --git a/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
 new file mode 100644
-index 00000000..ad06a856
+index 000000000..ad06a856f
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
 @@ -0,0 +1,119 @@
@@ -1992,7 +1992,7 @@ index 00000000..ad06a856
 +}
 diff --git a/src/main/java/net/minecraft/server/NBTTagByteArray.java b/src/main/java/net/minecraft/server/NBTTagByteArray.java
 new file mode 100644
-index 00000000..cd531412
+index 000000000..cd5314121
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/NBTTagByteArray.java
 @@ -0,0 +1,160 @@
@@ -2158,7 +2158,7 @@ index 00000000..cd531412
 +}
 diff --git a/src/main/java/net/minecraft/server/NBTTagIntArray.java b/src/main/java/net/minecraft/server/NBTTagIntArray.java
 new file mode 100644
-index 00000000..36a9edd2
+index 000000000..36a9edd2e
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/NBTTagIntArray.java
 @@ -0,0 +1,170 @@
@@ -2334,10 +2334,10 @@ index 00000000..36a9edd2
 +}
 diff --git a/src/main/java/net/minecraft/server/NibbleArray.java b/src/main/java/net/minecraft/server/NibbleArray.java
 new file mode 100644
-index 00000000..46eaacc0
+index 000000000..ed6672713
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/NibbleArray.java
-@@ -0,0 +1,96 @@
+@@ -0,0 +1,100 @@
 +package net.minecraft.server;
 +
 +import javax.annotation.Nullable;
@@ -2356,6 +2356,10 @@ index 00000000..46eaacc0
 +        }
 +    }
 +
++    protected NibbleArray(int i) {
++        this.a = new byte[i];
++    }
++
 +    public int a(int i, int j, int k) {
 +        return this.a(this.b(i, j, k));
 +    }
@@ -2436,7 +2440,7 @@ index 00000000..46eaacc0
 +}
 diff --git a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
 new file mode 100644
-index 00000000..6aeea22a
+index 000000000..6aeea22ae
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
 @@ -0,0 +1,41 @@
@@ -2483,7 +2487,7 @@ index 00000000..6aeea22a
 +}
 diff --git a/src/main/java/net/minecraft/server/PacketPlayInBlockPlace.java b/src/main/java/net/minecraft/server/PacketPlayInBlockPlace.java
 new file mode 100644
-index 00000000..bb88f7c1
+index 000000000..bb88f7c1a
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/PacketPlayInBlockPlace.java
 @@ -0,0 +1,32 @@
@@ -2521,7 +2525,7 @@ index 00000000..bb88f7c1
 +}
 diff --git a/src/main/java/net/minecraft/server/PacketPlayInChat.java b/src/main/java/net/minecraft/server/PacketPlayInChat.java
 new file mode 100644
-index 00000000..699815b3
+index 000000000..699815b3d
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/PacketPlayInChat.java
 @@ -0,0 +1,36 @@
@@ -2563,7 +2567,7 @@ index 00000000..699815b3
 +}
 diff --git a/src/main/java/net/minecraft/server/PacketPlayInUseItem.java b/src/main/java/net/minecraft/server/PacketPlayInUseItem.java
 new file mode 100644
-index 00000000..2f8160ed
+index 000000000..2f8160ed1
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/PacketPlayInUseItem.java
 @@ -0,0 +1,35 @@
@@ -2604,7 +2608,7 @@ index 00000000..2f8160ed
 +}
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutChat.java b/src/main/java/net/minecraft/server/PacketPlayOutChat.java
 new file mode 100644
-index 00000000..417c2677
+index 000000000..417c26775
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutChat.java
 @@ -0,0 +1,49 @@
@@ -2659,7 +2663,7 @@ index 00000000..417c2677
 +}
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
 new file mode 100644
-index 00000000..abb6fcd0
+index 000000000..abb6fcd0e
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -0,0 +1,271 @@
@@ -2936,7 +2940,7 @@ index 00000000..abb6fcd0
 +}
 diff --git a/src/main/java/net/minecraft/server/ServerConnection.java b/src/main/java/net/minecraft/server/ServerConnection.java
 new file mode 100644
-index 00000000..08df04b7
+index 000000000..e64f8115c
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/ServerConnection.java
 @@ -0,0 +1,143 @@
@@ -2970,7 +2974,7 @@ index 00000000..08df04b7
 +
 +public class ServerConnection {
 +
-+    private static final Logger d = LogManager.getLogger();
++    private static final Logger LOGGER = LogManager.getLogger();
 +    public static final LazyInitVar<NioEventLoopGroup> a = new LazyInitVar<>(() -> {
 +        return new NioEventLoopGroup(0, (new ThreadFactoryBuilder()).setNameFormat("Netty Server IO #%d").setDaemon(true).build());
 +    });
@@ -2997,11 +3001,11 @@ index 00000000..08df04b7
 +            if (Epoll.isAvailable() && this.e.W()) {
 +                oclass = EpollServerSocketChannel.class;
 +                lazyinitvar = ServerConnection.b;
-+                ServerConnection.d.info("Using epoll channel type");
++                ServerConnection.LOGGER.info("Using epoll channel type");
 +            } else {
 +                oclass = NioServerSocketChannel.class;
 +                lazyinitvar = ServerConnection.a;
-+                ServerConnection.d.info("Using default channel type");
++                ServerConnection.LOGGER.info("Using default channel type");
 +            }
 +
 +            this.f.add(((ServerBootstrap) ((ServerBootstrap) (new ServerBootstrap()).channel(oclass)).childHandler(new ChannelInitializer<Channel>() {
@@ -3033,7 +3037,7 @@ index 00000000..08df04b7
 +            try {
 +                channelfuture.channel().close().sync();
 +            } catch (InterruptedException interruptedexception) {
-+                ServerConnection.d.error("Interrupted whilst closing channel");
++                ServerConnection.LOGGER.error("Interrupted whilst closing channel");
 +            }
 +        }
 +
@@ -3061,7 +3065,7 @@ index 00000000..08df04b7
 +                                throw new ReportedException(crashreport);
 +                            }
 +
-+                            ServerConnection.d.warn("Failed to handle packet for {}", networkmanager.getSocketAddress(), exception);
++                            ServerConnection.LOGGER.warn("Failed to handle packet for {}", networkmanager.getSocketAddress(), exception);
 +                            ChatComponentText chatcomponenttext = new ChatComponentText("Internal server error");
 +
 +                            networkmanager.sendPacket(new PacketPlayOutKickDisconnect(chatcomponenttext), (future) -> {
@@ -3085,7 +3089,7 @@ index 00000000..08df04b7
 +}
 diff --git a/src/main/java/net/minecraft/server/ServerStatisticManager.java b/src/main/java/net/minecraft/server/ServerStatisticManager.java
 new file mode 100644
-index 00000000..5899cd49
+index 000000000..aa9bbfd1c
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/ServerStatisticManager.java
 @@ -0,0 +1,234 @@
@@ -3116,7 +3120,7 @@ index 00000000..5899cd49
 +
 +public class ServerStatisticManager extends StatisticManager {
 +
-+    private static final Logger b = LogManager.getLogger();
++    private static final Logger LOGGER = LogManager.getLogger();
 +    private final MinecraftServer c;
 +    private final File d;
 +    private final Set<Statistic<?>> e = Sets.newHashSet();
@@ -3129,9 +3133,9 @@ index 00000000..5899cd49
 +            try {
 +                this.a(minecraftserver.aA(), org.apache.commons.io.FileUtils.readFileToString(file));
 +            } catch (IOException ioexception) {
-+                ServerStatisticManager.b.error("Couldn't read statistics file {}", file, ioexception);
++                ServerStatisticManager.LOGGER.error("Couldn't read statistics file {}", file, ioexception);
 +            } catch (JsonParseException jsonparseexception) {
-+                ServerStatisticManager.b.error("Couldn't parse statistics file {}", file, jsonparseexception);
++                ServerStatisticManager.LOGGER.error("Couldn't parse statistics file {}", file, jsonparseexception);
 +            }
 +        }
 +
@@ -3141,7 +3145,7 @@ index 00000000..5899cd49
 +        try {
 +            org.apache.commons.io.FileUtils.writeStringToFile(this.d, this.b());
 +        } catch (IOException ioexception) {
-+            ServerStatisticManager.b.error("Couldn't save stats", ioexception);
++            ServerStatisticManager.LOGGER.error("Couldn't save stats", ioexception);
 +        }
 +
 +    }
@@ -3195,15 +3199,15 @@ index 00000000..5899cd49
 +                                            SystemUtils.a(this.a(statisticwrapper, s2), (statistic) -> {
 +                                                this.a.put(statistic, nbttagcompound2.getInt(s2));
 +                                            }, () -> {
-+                                                ServerStatisticManager.b.warn("Invalid statistic in {}: Don't know what {} is", this.d, s2);
++                                                ServerStatisticManager.LOGGER.warn("Invalid statistic in {}: Don't know what {} is", this.d, s2);
 +                                            });
 +                                        } else {
-+                                            ServerStatisticManager.b.warn("Invalid statistic value in {}: Don't know what {} is for key {}", this.d, nbttagcompound2.get(s2), s2);
++                                            ServerStatisticManager.LOGGER.warn("Invalid statistic value in {}: Don't know what {} is for key {}", this.d, nbttagcompound2.get(s2), s2);
 +                                        }
 +                                    }
 +
 +                                }, () -> {
-+                                    ServerStatisticManager.b.warn("Invalid statistic type in {}: Don't know what {} is", this.d, s1);
++                                    ServerStatisticManager.LOGGER.warn("Invalid statistic type in {}: Don't know what {} is", this.d, s1);
 +                                });
 +                            }
 +                        }
@@ -3212,7 +3216,7 @@ index 00000000..5899cd49
 +                    return;
 +                }
 +
-+                ServerStatisticManager.b.error("Unable to parse Stat data from {}", this.d);
++                ServerStatisticManager.LOGGER.error("Unable to parse Stat data from {}", this.d);
 +            } catch (Throwable throwable1) {
 +                throwable = throwable1;
 +                throw throwable1;
@@ -3232,7 +3236,7 @@ index 00000000..5899cd49
 +            }
 +
 +        } catch (IOException | JsonParseException jsonparseexception) {
-+            ServerStatisticManager.b.error("Unable to parse Stat data from {}", this.d, jsonparseexception);
++            ServerStatisticManager.LOGGER.error("Unable to parse Stat data from {}", this.d, jsonparseexception);
 +        }
 +    }
 +
@@ -3325,7 +3329,7 @@ index 00000000..5899cd49
 +}
 diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java
 new file mode 100644
-index 00000000..0ad0c183
+index 000000000..0ad0c183c
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/TileEntitySkull.java
 @@ -0,0 +1,119 @@
@@ -3450,7 +3454,7 @@ index 00000000..0ad0c183
 +}
 diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureDesertPyramid.java b/src/main/java/net/minecraft/server/WorldGenFeatureDesertPyramid.java
 new file mode 100644
-index 00000000..4f1d57b8
+index 000000000..4f1d57b8a
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/WorldGenFeatureDesertPyramid.java
 @@ -0,0 +1,46 @@
@@ -3502,7 +3506,7 @@ index 00000000..4f1d57b8
 +}
 diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureIgloo.java b/src/main/java/net/minecraft/server/WorldGenFeatureIgloo.java
 new file mode 100644
-index 00000000..0f6ce152
+index 000000000..0f6ce1526
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/WorldGenFeatureIgloo.java
 @@ -0,0 +1,50 @@
@@ -3558,7 +3562,7 @@ index 00000000..0f6ce152
 +}
 diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureJunglePyramid.java b/src/main/java/net/minecraft/server/WorldGenFeatureJunglePyramid.java
 new file mode 100644
-index 00000000..35458425
+index 000000000..354584258
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/WorldGenFeatureJunglePyramid.java
 @@ -0,0 +1,46 @@
@@ -3610,7 +3614,7 @@ index 00000000..35458425
 +}
 diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuin.java b/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuin.java
 new file mode 100644
-index 00000000..5f847e68
+index 000000000..5f847e68f
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuin.java
 @@ -0,0 +1,86 @@
@@ -3702,7 +3706,7 @@ index 00000000..5f847e68
 +}
 diff --git a/src/main/java/net/minecraft/server/WorldGenFeaturePillagerOutpost.java b/src/main/java/net/minecraft/server/WorldGenFeaturePillagerOutpost.java
 new file mode 100644
-index 00000000..9a0dd37e
+index 000000000..9a0dd37ea
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/WorldGenFeaturePillagerOutpost.java
 @@ -0,0 +1,88 @@
@@ -3796,7 +3800,7 @@ index 00000000..9a0dd37e
 +}
 diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureRandomScattered.java b/src/main/java/net/minecraft/server/WorldGenFeatureRandomScattered.java
 new file mode 100644
-index 00000000..ae797325
+index 000000000..ae7973254
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/WorldGenFeatureRandomScattered.java
 @@ -0,0 +1,56 @@
@@ -3858,7 +3862,7 @@ index 00000000..ae797325
 +}
 diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureShipwreck.java b/src/main/java/net/minecraft/server/WorldGenFeatureShipwreck.java
 new file mode 100644
-index 00000000..e89dbbcb
+index 000000000..e89dbbcb7
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/WorldGenFeatureShipwreck.java
 @@ -0,0 +1,58 @@
@@ -3922,7 +3926,7 @@ index 00000000..e89dbbcb
 +}
 diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureSwampHut.java b/src/main/java/net/minecraft/server/WorldGenFeatureSwampHut.java
 new file mode 100644
-index 00000000..a68795c3
+index 000000000..a68795c30
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/WorldGenFeatureSwampHut.java
 @@ -0,0 +1,73 @@
@@ -4001,7 +4005,7 @@ index 00000000..a68795c3
 +}
 diff --git a/src/main/java/net/minecraft/server/WorldGenMonument.java b/src/main/java/net/minecraft/server/WorldGenMonument.java
 new file mode 100644
-index 00000000..2a072e07
+index 000000000..2a072e07a
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/WorldGenMonument.java
 @@ -0,0 +1,128 @@
@@ -4135,7 +4139,7 @@ index 00000000..2a072e07
 +}
 diff --git a/src/main/java/net/minecraft/server/WorldGenVillage.java b/src/main/java/net/minecraft/server/WorldGenVillage.java
 new file mode 100644
-index 00000000..ead45107
+index 000000000..ead451073
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/WorldGenVillage.java
 @@ -0,0 +1,75 @@

CraftBukkit-Patches/0004-Spigot-Configuration.patch

@@ -1,4 +1,4 @@
-From 6a9798cb046d576d6f7442939c0d84c891cda94f Mon Sep 17 00:00:00 2001
+From 740cdf164b0020a1ea3ac8a42da0691f7f2ba6b0 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 7 Jul 2013 09:32:53 +1000
 Subject: [PATCH] Spigot Configuration
@@ -6,7 +6,7 @@ Subject: [PATCH] Spigot Configuration
 Provides the basic infrastructure to load and save the Spigot configuration file, spigot.yml
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 4eda4450..f3fa0bb6 100644
+index 4eda44506..f3fa0bb62 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -146,6 +146,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -31,7 +31,7 @@ index 4eda4450..f3fa0bb6 100644
          server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.STARTUP);
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 8241a417..cd7e516f 100644
+index ec84a676c..7bcf0f401 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -83,6 +83,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
@@ -51,7 +51,7 @@ index 8241a417..cd7e516f 100644
          this.world = new CraftWorld((WorldServer) this, gen, env);
          this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 76c2d3f9..355eb3d9 100644
+index b1d04af27..4f25d45c3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -729,6 +729,7 @@ public final class CraftServer implements Server {
@@ -78,7 +78,7 @@ index 76c2d3f9..355eb3d9 100644
          ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index c441605f..ae320c2b 100644
+index c441605f0..ae320c2bb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -119,6 +119,14 @@ public class Main {
@@ -98,7 +98,7 @@ index c441605f..ae320c2b 100644
  
 diff --git a/src/main/java/org/spigotmc/SpigotCommand.java b/src/main/java/org/spigotmc/SpigotCommand.java
 new file mode 100644
-index 00000000..d0be3c3b
+index 000000000..d0be3c3b5
 --- /dev/null
 +++ b/src/main/java/org/spigotmc/SpigotCommand.java
 @@ -0,0 +1,44 @@
@@ -148,7 +148,7 @@ index 00000000..d0be3c3b
 +}
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
 new file mode 100644
-index 00000000..132ab78c
+index 000000000..132ab78ce
 --- /dev/null
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -0,0 +1,140 @@
@@ -294,7 +294,7 @@ index 00000000..132ab78c
 +}
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 new file mode 100644
-index 00000000..961ddb42
+index 000000000..961ddb428
 --- /dev/null
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -0,0 +1,71 @@

CraftBukkit-Patches/0005-Crop-Growth-Rates.patch

@@ -1,4 +1,4 @@
-From 9f898e3c4738115d1564eb12181ff1ec283d1cf3 Mon Sep 17 00:00:00 2001
+From eb1cc48cde31195d9cc3f7ae999b88441692b1e1 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 7 Mar 2016 22:14:13 +1100
 Subject: [PATCH] Crop Growth Rates
@@ -6,7 +6,7 @@ Subject: [PATCH] Crop Growth Rates
 Allows configuring the growth rates of crops as a percentage of their normal growth rate.
 
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index c999325c..64bc840f 100644
+index e9dc6297f..5054b8c8a 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -691,6 +691,18 @@ public class Block implements IMaterial {
@@ -29,7 +29,7 @@ index c999325c..64bc840f 100644
  
          NONE, XZ, XYZ;
 diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java
-index 0405815b..a26e7941 100644
+index 0405815b8..a26e79412 100644
 --- a/src/main/java/net/minecraft/server/BlockCactus.java
 +++ b/src/main/java/net/minecraft/server/BlockCactus.java
 @@ -33,7 +33,7 @@ public class BlockCactus extends Block {
@@ -42,7 +42,7 @@ index 0405815b..a26e7941 100644
                          IBlockData iblockdata1 = (IBlockData) iblockdata.set(BlockCactus.AGE, 0);
  
 diff --git a/src/main/java/net/minecraft/server/BlockCocoa.java b/src/main/java/net/minecraft/server/BlockCocoa.java
-index bdceb4be..04d47c5a 100644
+index bdceb4bec..04d47c5a4 100644
 --- a/src/main/java/net/minecraft/server/BlockCocoa.java
 +++ b/src/main/java/net/minecraft/server/BlockCocoa.java
 @@ -20,7 +20,7 @@ public class BlockCocoa extends BlockFacingHorizontal implements IBlockFragilePl
@@ -55,7 +55,7 @@ index bdceb4be..04d47c5a 100644
  
              if (i < 2) {
 diff --git a/src/main/java/net/minecraft/server/BlockCrops.java b/src/main/java/net/minecraft/server/BlockCrops.java
-index d3e247a0..b30e2a7d 100644
+index d3e247a0c..b30e2a7d1 100644
 --- a/src/main/java/net/minecraft/server/BlockCrops.java
 +++ b/src/main/java/net/minecraft/server/BlockCrops.java
 @@ -53,7 +53,20 @@ public class BlockCrops extends BlockPlant implements IBlockFragilePlantElement
@@ -81,7 +81,7 @@ index d3e247a0..b30e2a7d 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/BlockMushroom.java b/src/main/java/net/minecraft/server/BlockMushroom.java
-index 2a0dfaf4..fbaee65a 100644
+index 2a0dfaf4e..fbaee65ad 100644
 --- a/src/main/java/net/minecraft/server/BlockMushroom.java
 +++ b/src/main/java/net/minecraft/server/BlockMushroom.java
 @@ -22,7 +22,7 @@ public class BlockMushroom extends BlockPlant implements IBlockFragilePlantEleme
@@ -94,7 +94,7 @@ index 2a0dfaf4..fbaee65a 100644
              boolean flag = true;
              Iterator iterator = BlockPosition.a(blockposition.b(-4, -1, -4), blockposition.b(4, 1, 4)).iterator();
 diff --git a/src/main/java/net/minecraft/server/BlockNetherWart.java b/src/main/java/net/minecraft/server/BlockNetherWart.java
-index 8c24563f..56468fda 100644
+index 8c24563f2..56468fdaf 100644
 --- a/src/main/java/net/minecraft/server/BlockNetherWart.java
 +++ b/src/main/java/net/minecraft/server/BlockNetherWart.java
 @@ -26,7 +26,7 @@ public class BlockNetherWart extends BlockPlant {
@@ -107,7 +107,7 @@ index 8c24563f..56468fda 100644
              org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockGrowEvent(world, blockposition, iblockdata, 2); // CraftBukkit
          }
 diff --git a/src/main/java/net/minecraft/server/BlockReed.java b/src/main/java/net/minecraft/server/BlockReed.java
-index 8151db50..4d5f485f 100644
+index 8151db501..4d5f485f0 100644
 --- a/src/main/java/net/minecraft/server/BlockReed.java
 +++ b/src/main/java/net/minecraft/server/BlockReed.java
 @@ -32,7 +32,7 @@ public class BlockReed extends Block {
@@ -120,7 +120,7 @@ index 8151db50..4d5f485f 100644
                      world.setTypeAndData(blockposition, (IBlockData) iblockdata.set(BlockReed.AGE, 0), 4);
                  } else {
 diff --git a/src/main/java/net/minecraft/server/BlockSapling.java b/src/main/java/net/minecraft/server/BlockSapling.java
-index b6303873..28517b63 100644
+index b63038734..28517b63f 100644
 --- a/src/main/java/net/minecraft/server/BlockSapling.java
 +++ b/src/main/java/net/minecraft/server/BlockSapling.java
 @@ -32,7 +32,7 @@ public class BlockSapling extends BlockPlant implements IBlockFragilePlantElemen
@@ -133,7 +133,7 @@ index b6303873..28517b63 100644
              world.captureTreeGeneration = true;
              // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/BlockStem.java b/src/main/java/net/minecraft/server/BlockStem.java
-index bacf6b22..3801f969 100644
+index bacf6b22b..3801f969b 100644
 --- a/src/main/java/net/minecraft/server/BlockStem.java
 +++ b/src/main/java/net/minecraft/server/BlockStem.java
 @@ -32,7 +32,7 @@ public class BlockStem extends BlockPlant implements IBlockFragilePlantElement {
@@ -146,7 +146,7 @@ index bacf6b22..3801f969 100644
  
                  if (i < 7) {
 diff --git a/src/main/java/net/minecraft/server/BlockVine.java b/src/main/java/net/minecraft/server/BlockVine.java
-index 4f1cfd93..0870310e 100644
+index 4f1cfd93e..0870310e6 100644
 --- a/src/main/java/net/minecraft/server/BlockVine.java
 +++ b/src/main/java/net/minecraft/server/BlockVine.java
 @@ -161,7 +161,7 @@ public class BlockVine extends Block {
@@ -159,7 +159,7 @@ index 4f1cfd93..0870310e 100644
                  BlockPosition blockposition1 = blockposition.up();
                  BlockPosition blockposition2;
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 961ddb42..8763048a 100644
+index 961ddb428..8763048a3 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -68,4 +68,47 @@ public class SpigotWorldConfig

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

@@ -1,4 +1,4 @@
-From e238710b04810d6642d2c1b97cea0a7b97627235 Mon Sep 17 00:00:00 2001
+From 1319b1201a9eaf0a618cd9ba9e8d56577ab6d562 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 09:46:33 +1100
 Subject: [PATCH] Merge tweaks and configuration
@@ -6,7 +6,7 @@ Subject: [PATCH] Merge tweaks and configuration
 This allows the merging of Experience orbs, as well as the configuration of the merge radius of items. Additionally it refactors the merge algorithm to be a better experience for players.
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index b3595c8a..5dfdd8ab 100644
+index b3595c8ad..5dfdd8ab3 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -142,7 +142,10 @@ public class EntityItem extends Entity {
@@ -31,7 +31,7 @@ index b3595c8a..5dfdd8ab 100644
                          } else {
                              a(entityitem, itemstack1, this, itemstack);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 32efe87d..5c2bebf5 100644
+index 3eb6a23e3..010c0780c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -491,6 +491,23 @@ public class CraftEventFactory {
@@ -59,7 +59,7 @@ index 32efe87d..5c2bebf5 100644
              event = CraftEventFactory.callEntitySpawnEvent(entity);
          }
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 8763048a..23ce7243 100644
+index 8763048a3..23ce7243a 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -111,4 +111,18 @@ public class SpigotWorldConfig

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

@@ -1,4 +1,4 @@
-From 65f60916e96f4d426eaf005d4481effedaead09b Mon Sep 17 00:00:00 2001
+From 76503a926de412ddff5035d9d48f0814f4d3f3d2 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 25 Mar 2014 16:10:01 +1100
 Subject: [PATCH] Async Operation Catching
@@ -6,7 +6,7 @@ Subject: [PATCH] Async Operation Catching
 Catch and throw an exception when a potentially unsafe operation occurs on a thread other than the main server thread.
 
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index 64bc840f..c6d53622 100644
+index 5054b8c8a..8b91e27c6 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -369,10 +369,13 @@ public class Block implements IMaterial {
@@ -25,7 +25,7 @@ index 64bc840f..c6d53622 100644
              world.removeTileEntity(blockposition);
          }
 diff --git a/src/main/java/net/minecraft/server/CraftingManager.java b/src/main/java/net/minecraft/server/CraftingManager.java
-index eb5de90d..26d2f54b 100644
+index 15dbaeb19..0086d3fd8 100644
 --- a/src/main/java/net/minecraft/server/CraftingManager.java
 +++ b/src/main/java/net/minecraft/server/CraftingManager.java
 @@ -88,6 +88,7 @@ public class CraftingManager implements IResourcePackListener {
@@ -37,7 +37,7 @@ index eb5de90d..26d2f54b 100644
  
          if (map.containsKey(irecipe.getKey())) {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 3621d927..a2e63748 100644
+index 7dfbe45d5..31abdec9c 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -815,6 +815,7 @@ public abstract class EntityLiving extends Entity {
@@ -49,10 +49,10 @@ index 3621d927..a2e63748 100644
              effectsToProcess.add(new ProcessableEffect(mobeffect, cause));
              return true;
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 09903128..6d5489a7 100644
+index be081aaee..2dbef282f 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-@@ -814,6 +814,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -820,6 +820,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
      }
  
      protected void addEntity(Entity entity) {
@@ -60,7 +60,7 @@ index 09903128..6d5489a7 100644
          if (!(entity instanceof EntityComplexPart)) {
              if (!(entity instanceof EntityLightning)) {
                  EntityTypes<?> entitytypes = entity.getEntityType();
-@@ -848,6 +849,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -854,6 +855,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
      }
  
      protected void removeEntity(Entity entity) {
@@ -68,7 +68,7 @@ index 09903128..6d5489a7 100644
          if (entity instanceof EntityPlayer) {
              EntityPlayer entityplayer = (EntityPlayer) entity;
  
-@@ -1035,6 +1037,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -1041,6 +1043,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
          }
  
          public void clear(EntityPlayer entityplayer) {
@@ -76,7 +76,7 @@ index 09903128..6d5489a7 100644
              if (this.trackedPlayers.remove(entityplayer)) {
                  this.trackerEntry.a(entityplayer);
              }
-@@ -1042,6 +1045,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -1048,6 +1051,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
          }
  
          public void updatePlayer(EntityPlayer entityplayer) {
@@ -85,7 +85,7 @@ index 09903128..6d5489a7 100644
                  Vec3D vec3d = (new Vec3D(entityplayer.locX, entityplayer.locY, entityplayer.locZ)).d(this.trackerEntry.b());
                  int i = Math.min(this.trackingDistance, (PlayerChunkMap.this.A - 1) * 16);
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 1a68be70..37d6370d 100644
+index 0b41f990d..a3950cf4b 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -904,6 +904,7 @@ public class WorldServer extends World {
@@ -94,7 +94,7 @@ index 1a68be70..37d6370d 100644
      private boolean addEntity0(Entity entity, CreatureSpawnEvent.SpawnReason spawnReason) {
 +        org.spigotmc.AsyncCatcher.catchOp( "entity add"); // Spigot
          if (entity.dead) {
-             // WorldServer.v.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getName(entity.getEntityType())); // CraftBukkit
+             // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getName(entity.getEntityType())); // CraftBukkit
              return false;
 @@ -1025,6 +1026,7 @@ public class WorldServer extends World {
      }
@@ -105,7 +105,7 @@ index 1a68be70..37d6370d 100644
              throw new IllegalStateException("Removing entity while ticking!");
          } else {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 355eb3d9..dc62768e 100644
+index 4f25d45c3..2f3f8cf3a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -682,6 +682,7 @@ public final class CraftServer implements Server {
@@ -117,7 +117,7 @@ index 355eb3d9..dc62768e 100644
          if (commandMap.dispatch(sender, commandLine)) {
              return true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index a4938dd5..c4df3535 100644
+index a4938dd57..c4df35351 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -357,6 +357,7 @@ public class CraftWorld implements World {
@@ -153,7 +153,7 @@ index a4938dd5..c4df3535 100644
  
          // If generate = false, but the chunk already exists, we will get this back.
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e3d006fa..f7f4f44d 100644
+index e3d006fa2..f7f4f44de 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -295,6 +295,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -165,7 +165,7 @@ index e3d006fa..f7f4f44d 100644
  
          getHandle().playerConnection.disconnect(message == null ? "" : message);
 diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java
-index afbc1a96..305ef948 100644
+index afbc1a960..305ef9480 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java
 @@ -39,6 +39,7 @@ public final class CraftScoreboardManager implements ScoreboardManager {
@@ -177,7 +177,7 @@ index afbc1a96..305ef948 100644
          scoreboards.add(scoreboard);
          return scoreboard;
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
-index 2e057fd4..ddef523e 100644
+index 2e057fd4c..ddef523ea 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
 @@ -12,6 +12,7 @@ public class ServerShutdownThread extends Thread {
@@ -190,7 +190,7 @@ index 2e057fd4..ddef523e 100644
              try {
 diff --git a/src/main/java/org/spigotmc/AsyncCatcher.java b/src/main/java/org/spigotmc/AsyncCatcher.java
 new file mode 100644
-index 00000000..aeed7697
+index 000000000..aeed76972
 --- /dev/null
 +++ b/src/main/java/org/spigotmc/AsyncCatcher.java
 @@ -0,0 +1,17 @@

CraftBukkit-Patches/0008-View-Distance.patch

@@ -1,4 +1,4 @@
-From 627b770a8af420a9b799253c795bb6a9c37d0cfa Mon Sep 17 00:00:00 2001
+From d28d76213577c90bfd7552575537874a0da5c4db Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 09:52:41 +1100
 Subject: [PATCH] View Distance
@@ -6,7 +6,7 @@ Subject: [PATCH] View Distance
 This commit allows the user to select per world view distances, and view distances below 3. Be wary of the issues selecting a view distance of 1 or 2 may cause!
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 37d6370d..f577ba7f 100644
+index a3950cf4b..c5bdc335f 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -87,7 +87,7 @@ public class WorldServer extends World {
@@ -19,7 +19,7 @@ index 37d6370d..f577ba7f 100644
              });
              // CraftBukkit end
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 23ce7243..0dd4b2d3 100644
+index 23ce7243a..0dd4b2d37 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -125,4 +125,11 @@ public class SpigotWorldConfig

CraftBukkit-Patches/0009-Spigot-Timings.patch

@@ -1,4 +1,4 @@
-From 08c4348141ec97430253b27ec70f795e0a57c3fd Mon Sep 17 00:00:00 2001
+From df39f268678a632bce6462afc03ee0eeb4bd7a18 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 10 Jan 2013 00:18:11 -0500
 Subject: [PATCH] Spigot Timings
@@ -6,7 +6,7 @@ Subject: [PATCH] Spigot Timings
 Overhauls the Timings System adding performance tracking all around the Minecraft Server
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index c0d35dbf..416f8e08 100644
+index b763cdd8b..845ad7427 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -81,8 +81,10 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -15,7 +15,7 @@ index c0d35dbf..416f8e08 100644
          if (flag1) {
 +            world.timings.syncChunkLoadTimer.startTiming(); // Spigot
              completablefuture = this.getChunkFutureMainThread(i, j, chunkstatus, flag);
-             this.serverThreadQueue.c((BooleanSupplier) completablefuture::isDone); // CraftBukkit - decompile error
+             this.serverThreadQueue.awaitTasks((BooleanSupplier) completablefuture::isDone); // CraftBukkit - decompile error
 +            world.timings.syncChunkLoadTimer.stopTiming(); // Spigot
          } else {
              completablefuture = CompletableFuture.supplyAsync(() -> {
@@ -70,7 +70,7 @@ index c0d35dbf..416f8e08 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 30f226e9..c91347c6 100644
+index b3c76c9af..d084d24a0 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -412,6 +412,7 @@ public class ChunkRegionLoader {
@@ -108,7 +108,7 @@ index 30f226e9..c91347c6 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index f3fa0bb6..213312b3 100644
+index f3fa0bb62..213312b38 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -31,6 +31,7 @@ import org.apache.logging.log4j.Level;
@@ -136,10 +136,10 @@ index f3fa0bb6..213312b3 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 6cfbb946..77ad70f8 100644
+index 2c866a144..ad450a266 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -30,6 +30,7 @@ import org.bukkit.command.CommandSender;
+@@ -29,6 +29,7 @@ import org.bukkit.command.CommandSender;
  import org.bukkit.entity.Hanging;
  import org.bukkit.entity.LivingEntity;
  import org.bukkit.entity.Vehicle;
@@ -147,7 +147,7 @@ index 6cfbb946..77ad70f8 100644
  import org.bukkit.event.entity.EntityCombustByEntityEvent;
  import org.bukkit.event.hanging.HangingBreakByEntityEvent;
  import org.bukkit.event.vehicle.VehicleBlockCollisionEvent;
-@@ -158,6 +159,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
+@@ -157,6 +158,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
      public boolean valid;
      public org.bukkit.projectiles.ProjectileSource projectileSource; // For projectiles only
      public boolean forceExplosionKnockback; // SPIGOT-949
@@ -155,7 +155,7 @@ index 6cfbb946..77ad70f8 100644
  
      public float getBukkitYaw() {
          return this.yaw;
-@@ -461,6 +463,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
+@@ -460,6 +462,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
      }
  
      public void move(EnumMoveType enummovetype, Vec3D vec3d) {
@@ -163,7 +163,7 @@ index 6cfbb946..77ad70f8 100644
          if (this.noclip) {
              this.a(this.getBoundingBox().b(vec3d));
              this.recalcPosition();
-@@ -625,6 +628,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
+@@ -624,6 +627,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
  
              this.world.getMethodProfiler().exit();
          }
@@ -172,7 +172,7 @@ index 6cfbb946..77ad70f8 100644
  
      protected Vec3D a(Vec3D vec3d, EnumMoveType enummovetype) {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index a2e63748..6beb710c 100644
+index 31abdec9c..904d86292 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -35,6 +35,8 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -247,7 +247,7 @@ index a2e63748..6beb710c 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 86860712..e4c51a7c 100644
+index 33b616c16..b725cc6e7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -54,6 +54,7 @@ import org.bukkit.craftbukkit.CraftServer;
@@ -351,7 +351,7 @@ index 86860712..e4c51a7c 100644
          this.methodProfiler.exit();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 0e936a51..887b8a40 100644
+index 0e936a511..887b8a40b 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -136,6 +136,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -396,7 +396,7 @@ index 0e936a51..887b8a40 100644
          // this.minecraftServer.getCommandDispatcher().a(this.player.getCommandListener(), s);
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 0a24dbe2..208cdca4 100644
+index 639d3d7ac..d3717d3a4 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -4,10 +4,12 @@ import javax.annotation.Nullable;
@@ -409,11 +409,11 @@ index 0a24dbe2..208cdca4 100644
  public abstract class TileEntity {
  
 +    public CustomTimingsHandler tickTimer = org.bukkit.craftbukkit.SpigotTimings.getTileEntityTimings(this); // Spigot
-     private static final Logger a = LogManager.getLogger();
+     private static final Logger LOGGER = LogManager.getLogger();
      private final TileEntityTypes<?> b;
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index cd7e516f..f5bc1d66 100644
+index 7bcf0f401..cf10a89d8 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -20,6 +20,7 @@ import java.util.ArrayList;
@@ -509,7 +509,7 @@ index cd7e516f..f5bc1d66 100644
  
      public boolean a(AxisAlignedBB axisalignedbb) {
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index f577ba7f..d8c29281 100644
+index c5bdc335f..799881601 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -37,6 +37,7 @@ import org.bukkit.Bukkit;
@@ -585,7 +585,7 @@ index f577ba7f..d8c29281 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index dc62768e..cc8dfcc4 100644
+index 2f3f8cf3a..75af8ba03 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1886,6 +1886,11 @@ public final class CraftServer implements Server {
@@ -602,7 +602,7 @@ index dc62768e..cc8dfcc4 100644
      public Spigot spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 new file mode 100644
-index 00000000..153be935
+index 000000000..153be935e
 --- /dev/null
 +++ b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 @@ -0,0 +1,163 @@
@@ -770,7 +770,7 @@ index 00000000..153be935
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 071fc631..e9fce862 100644
+index 071fc631b..e9fce8622 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -387,7 +387,9 @@ public class CraftScheduler implements BukkitScheduler {
@@ -784,7 +784,7 @@ index 071fc631..e9fce862 100644
                      task.getOwner().getLogger().log(
                              Level.WARNING,
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
-index a85fbbb6..3f55381c 100644
+index a85fbbb69..3f55381c1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
 @@ -2,11 +2,13 @@ package org.bukkit.craftbukkit.scheduler;

CraftBukkit-Patches/0010-Fix-Mob-Spawning-Relative-to-View-Distance.patch

@@ -1,4 +1,4 @@
-From 2b58894487dbdd53e529879842c050d7debd3501 Mon Sep 17 00:00:00 2001
+From 178449fa25b83a02c1fdd364b86162281068f8fc Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 17:29:54 +1000
 Subject: [PATCH] Fix Mob Spawning Relative to View Distance
@@ -8,10 +8,10 @@ Changes the mob spawning algorithm to properly account for view distance and the
 Needs better documentation.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 6d5489a7..86e69460 100644
+index 2dbef282f..042a06a30 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-@@ -674,8 +674,16 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -680,8 +680,16 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
      }
  
      boolean d(ChunkCoordIntPair chunkcoordintpair) {
@@ -30,7 +30,7 @@ index 6d5489a7..86e69460 100644
      }
  
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 0dd4b2d3..bcf5d165 100644
+index 0dd4b2d37..bcf5d1653 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -132,4 +132,11 @@ public class SpigotWorldConfig

CraftBukkit-Patches/0011-Handle-Null-Tile-Entities.patch

@@ -1,11 +1,11 @@
-From a5de0445ee5dcd1dec78fc9d59fc0ac5a2964d2d Mon Sep 17 00:00:00 2001
+From 79828e92f730abd78bfe8bba5f98ad9e76b953c9 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 3 Feb 2013 09:20:19 +1100
 Subject: [PATCH] Handle Null Tile Entities
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f5bc1d66..6ad9a9b6 100644
+index cf10a89d8..8a295b346 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -628,6 +628,13 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose

CraftBukkit-Patches/0012-Item-Despawn-Rate.patch

@@ -1,11 +1,11 @@
-From f5f0b38c79af0374315570f013bb83cdfb2216e9 Mon Sep 17 00:00:00 2001
+From c64bd95e9a69e90e0ea3b31f78c27c1eb5313e10 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 22 Sep 2013 19:10:53 +1000
 Subject: [PATCH] Item Despawn Rate
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 5dfdd8ab..fb6f944a 100644
+index 5dfdd8ab3..fb6f944a8 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -122,7 +122,7 @@ public class EntityItem extends Entity {
@@ -27,7 +27,7 @@ index 5dfdd8ab..fb6f944a 100644
  
      @Override
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index bcf5d165..a43131f8 100644
+index bcf5d1653..a43131f8b 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -139,4 +139,11 @@ public class SpigotWorldConfig

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

@@ -1,4 +1,4 @@
-From 223ea438c6c6a5754f949319becaa5a1ff2db3df Mon Sep 17 00:00:00 2001
+From bd69efa5e2bfc4b1c6bf124d4766ea506a2c4327 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Feb 2013 05:10:21 -0500
 Subject: [PATCH] Entity Activation Range
@@ -9,10 +9,10 @@ This will drastically cut down on tick timings for entities that are not in rang
 This change can have dramatic impact on gameplay if configured too low. Balance according to your servers desired gameplay.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 77ad70f8d..e615403e4 100644
+index ad450a266..6be92a50a 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -160,6 +160,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
+@@ -159,6 +159,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
      public org.bukkit.projectiles.ProjectileSource projectileSource; // For projectiles only
      public boolean forceExplosionKnockback; // SPIGOT-949
      public CustomTimingsHandler tickTimer = org.bukkit.craftbukkit.SpigotTimings.getEntityTimings(this); // Spigot
@@ -25,7 +25,7 @@ index 77ad70f8d..e615403e4 100644
  
      public float getBukkitYaw() {
          return this.yaw;
-@@ -187,7 +193,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
+@@ -186,7 +192,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
          this.setPosition(0.0D, 0.0D, 0.0D);
          if (world != null) {
              this.dimension = world.worldProvider.getDimensionManager();
@@ -75,7 +75,7 @@ index dfd1a7da4..da9740a99 100644
      public abstract EntityAgeable createChild(EntityAgeable entityageable);
  
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index 33bff879c..4767f7b36 100644
+index bb0335ddf..c6c9e79fa 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -35,6 +35,18 @@ public abstract class EntityArrow extends Entity implements IProjectile {
@@ -150,7 +150,7 @@ index fb6f944a8..fe70a3a8b 100644
          Vec3D vec3d = this.getMot();
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 6beb710cb..3e16632e2 100644
+index 904d86292..c1bb7a88a 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -132,6 +132,13 @@ public abstract class EntityLiving extends Entity {
@@ -168,7 +168,7 @@ index 6beb710cb..3e16632e2 100644
      protected EntityLiving(EntityTypes<? extends EntityLiving> entitytypes, World world) {
          super(entitytypes, world);
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 3a4a40bba..a94cdce2a 100644
+index d33faccc9..cc66f565c 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -133,6 +133,17 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -190,7 +190,7 @@ index 3a4a40bba..a94cdce2a 100644
      protected void mobTick() {
          this.world.getMethodProfiler().enter("brain");
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index d8c292814..cfdd51323 100644
+index 799881601..18110eecd 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -325,6 +325,7 @@ public class WorldServer extends World {

CraftBukkit-Patches/0014-Metrics.patch

@@ -1,4 +1,4 @@
-From 855a904573ec2af4f825517dde8b8143b4c87695 Mon Sep 17 00:00:00 2001
+From 444b09e5f0b27eb59d741dbf9018fd71e0f11c4a Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Feb 2013 08:58:35 +1100
 Subject: [PATCH] Metrics
@@ -6,7 +6,7 @@ Subject: [PATCH] Metrics
 
 diff --git a/src/main/java/org/spigotmc/Metrics.java b/src/main/java/org/spigotmc/Metrics.java
 new file mode 100644
-index 00000000..05d2d3d5
+index 000000000..05d2d3d52
 --- /dev/null
 +++ b/src/main/java/org/spigotmc/Metrics.java
 @@ -0,0 +1,645 @@
@@ -656,7 +656,7 @@ index 00000000..05d2d3d5
 +    }
 +}
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 132ab78c..dd02aefc 100644
+index 132ab78ce..dd02aefc7 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -36,6 +36,7 @@ public class SpigotConfig

CraftBukkit-Patches/0015-Entity-Tracking-Ranges.patch

@@ -1,4 +1,4 @@
-From fd3f39ad682b16dfb964e30d258f43fa4d3b5935 Mon Sep 17 00:00:00 2001
+From 36604ba253ff9b3b31d3df9287a2695233ebeac1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Feb 2013 11:58:47 -0500
 Subject: [PATCH] Entity Tracking Ranges
@@ -12,10 +12,10 @@ This has multiple benefits:
 4) Less client lag - Not trying to render distant item frames and paintings and entities will reduce entity count on the client, which is major for shop/town worlds which may use tons of item frames.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 86e69460..88a89f38 100644
+index 042a06a30..21353e389 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-@@ -827,6 +827,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -833,6 +833,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
              if (!(entity instanceof EntityLightning)) {
                  EntityTypes<?> entitytypes = entity.getEntityType();
                  int i = entitytypes.getChunkRange() * 16;
@@ -24,7 +24,7 @@ index 86e69460..88a89f38 100644
  
                  if (this.trackedEntities.containsKey(entity.getId())) {
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 2f93d630..79ba906e 100644
+index 2f93d630d..79ba906e2 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -159,4 +159,19 @@ public class SpigotWorldConfig
@@ -49,7 +49,7 @@ index 2f93d630..79ba906e 100644
  }
 diff --git a/src/main/java/org/spigotmc/TrackingRange.java b/src/main/java/org/spigotmc/TrackingRange.java
 new file mode 100644
-index 00000000..18d0a92f
+index 000000000..18d0a92f8
 --- /dev/null
 +++ b/src/main/java/org/spigotmc/TrackingRange.java
 @@ -0,0 +1,51 @@

CraftBukkit-Patches/0016-Remove-o-Option.patch

@@ -1,4 +1,4 @@
-From d846f9bc00c63f9eb3ed130eb5c777585e8ade05 Mon Sep 17 00:00:00 2001
+From a757157487f21b82086ea8cf9ae53e48ffa19dbb Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 19 May 2013 18:29:48 +1000
 Subject: [PATCH] Remove -o Option
@@ -6,7 +6,7 @@ Subject: [PATCH] Remove -o Option
 Serves no purpose other than to confuse users.
 
 diff --git a/src/main/java/net/minecraft/server/PropertyManager.java b/src/main/java/net/minecraft/server/PropertyManager.java
-index 204518c1..bf06e8cb 100644
+index 3ff81cc98..d42e7503a 100644
 --- a/src/main/java/net/minecraft/server/PropertyManager.java
 +++ b/src/main/java/net/minecraft/server/PropertyManager.java
 @@ -31,7 +31,7 @@ public abstract class PropertyManager<T extends PropertyManager<T>> {

CraftBukkit-Patches/0017-Implement-Arrow-API.patch

@@ -1,11 +1,11 @@
-From f3e82e085f0132fe9dc7eec837d8888af83bc5da Mon Sep 17 00:00:00 2001
+From f29b9ec598ddfc57a2e966d92b5b39525093fc03 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:16:05 +1000
 Subject: [PATCH] Implement Arrow API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
-index 743463db..a0f99059 100644
+index 743463db2..a0f990597 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
 @@ -109,6 +109,17 @@ public class CraftArrow extends AbstractProjectile implements Arrow {

CraftBukkit-Patches/0018-Hopper-Customisations.patch

@@ -1,4 +1,4 @@
-From 07b41f80db3fb4ac0ce291cf5534ab9bdae69c48 Mon Sep 17 00:00:00 2001
+From c9586bbafed498e02d64ec6fbb550d90270cf222 Mon Sep 17 00:00:00 2001
 From: erocs <github@erocs.org>
 Date: Sun, 8 Sep 2013 12:06:15 -0700
 Subject: [PATCH] Hopper Customisations
@@ -6,26 +6,26 @@ Subject: [PATCH] Hopper Customisations
 Allows editing hopper cooldowns and amount transferred per tick.
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
-index 40828bc2..6101bc60 100644
+index bb409f323..db6b0ecfe 100644
 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java
 +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
-@@ -113,9 +113,14 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
-             this.k = this.world.getTime();
-             if (!this.v()) {
-                 this.setCooldown(0);
--                this.a(() -> {
-+                // Spigot start
-+                boolean result = this.a(() -> {
-                     return a((IHopper) this);
-                 });
-+                if (!result && this.world.spigotConfig.hopperCheck > 1) {
-+                    this.setCooldown(this.world.spigotConfig.hopperCheck);
-+                }
-+                // Spigot end
-             }
+@@ -114,9 +114,14 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
+                 this.k = this.world.getTime();
+                 if (!this.v()) {
+                     this.setCooldown(0);
+-                    this.a(() -> {
++                    // Spigot start
++                    boolean result = this.a(() -> {
+                         return a((IHopper) this);
+                     });
++                    if (!result && this.world.spigotConfig.hopperCheck > 1) {
++                        this.setCooldown(this.world.spigotConfig.hopperCheck);
++                    }
++                    // Spigot end
+                 }
  
-         }
-@@ -135,7 +140,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
+             }
+@@ -137,7 +142,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
                  }
  
                  if (flag) {
@@ -34,7 +34,7 @@ index 40828bc2..6101bc60 100644
                      this.update();
                      return true;
                  }
-@@ -201,7 +206,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
+@@ -203,7 +208,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
                          // ItemStack itemstack1 = addItem(this, iinventory, this.splitStack(i, 1), enumdirection);
  
                          // CraftBukkit start - Call event when pushing items into other inventories
@@ -43,7 +43,7 @@ index 40828bc2..6101bc60 100644
  
                          Inventory destinationInventory;
                          // Have to special case large chests as they work oddly
-@@ -215,9 +220,10 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
+@@ -217,9 +222,10 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
                          this.getWorld().getServer().getPluginManager().callEvent(event);
                          if (event.isCancelled()) {
                              this.setItem(i, itemstack);
@@ -55,7 +55,7 @@ index 40828bc2..6101bc60 100644
                          ItemStack itemstack1 = addItem(this, iinventory, CraftItemStack.asNMSCopy(event.getItem()), enumdirection);
                          // CraftBukkit end
  
-@@ -226,6 +232,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
+@@ -228,6 +234,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
                              return true;
                          }
  
@@ -63,7 +63,7 @@ index 40828bc2..6101bc60 100644
                          this.setItem(i, itemstack);
                      }
                  }
-@@ -286,7 +293,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
+@@ -288,7 +295,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
              ItemStack itemstack1 = itemstack.cloneItemStack();
              // ItemStack itemstack2 = addItem(iinventory, ihopper, iinventory.splitStack(i, 1), (EnumDirection) null);
              // CraftBukkit start - Call event on collection of items from inventories into the hopper
@@ -72,7 +72,7 @@ index 40828bc2..6101bc60 100644
  
              Inventory sourceInventory;
              // Have to special case large chests as they work oddly
-@@ -303,13 +310,13 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
+@@ -305,13 +312,13 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
                  iinventory.setItem(i, itemstack1);
  
                  if (ihopper instanceof TileEntityHopper) {
@@ -89,7 +89,7 @@ index 40828bc2..6101bc60 100644
              ItemStack itemstack2 = addItem(iinventory, ihopper, CraftItemStack.asNMSCopy(event.getItem()), null);
              // CraftBukkit end
  
-@@ -318,6 +325,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
+@@ -320,6 +327,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
                  return true;
              }
  
@@ -97,7 +97,7 @@ index 40828bc2..6101bc60 100644
              iinventory.setItem(i, itemstack1);
          }
  
-@@ -408,7 +416,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
+@@ -410,7 +418,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
                              }
                          }
  
@@ -107,7 +107,7 @@ index 40828bc2..6101bc60 100644
                  }
  
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 79ba906e..62b75e33 100644
+index 79ba906e2..62b75e33a 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -174,4 +174,20 @@ public class SpigotWorldConfig

CraftBukkit-Patches/0019-Allow-Disabling-of-Command-Logging.patch

@@ -1,11 +1,11 @@
-From 5a0bd12302a157918bef73fbd8befaca0ff54310 Mon Sep 17 00:00:00 2001
+From 43309374f9764ad1968e112a7dc58ee96508335c Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 18:01:29 +1000
 Subject: [PATCH] Allow Disabling of Command Logging
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 887b8a40..98322d7e 100644
+index 887b8a40b..98322d7e4 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1604,6 +1604,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -17,7 +17,7 @@ index 887b8a40..98322d7e 100644
  
          CraftPlayer player = this.getPlayer();
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index dd02aefc..45e908ed 100644
+index dd02aefc7..45e908ed4 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -150,4 +150,10 @@ public class SpigotConfig

CraftBukkit-Patches/0020-Allow-Disabling-of-Command-TabComplete.patch

@@ -1,11 +1,11 @@
-From 47c2e2eab5fd75c53e1f5c2fad540f2521f0533e Mon Sep 17 00:00:00 2001
+From 170f2d60b2a5504873940c0a4a4858aff9c1189c Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 18:05:54 +1000
 Subject: [PATCH] Allow Disabling of Command TabComplete
 
 
 diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java
-index cf902d44..f467b185 100644
+index 9598f07ee..686878fb0 100644
 --- a/src/main/java/net/minecraft/server/CommandDispatcher.java
 +++ b/src/main/java/net/minecraft/server/CommandDispatcher.java
 @@ -232,6 +232,7 @@ public class CommandDispatcher {
@@ -25,7 +25,7 @@ index cf902d44..f467b185 100644
              if (commandnode2.canUse(commandlistenerwrapper)) {
                  ArgumentBuilder argumentbuilder = commandnode2.createBuilder(); // CraftBukkit - decompile error
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index cc8dfcc4..fbd444da 100644
+index 75af8ba03..d306b7a8a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1586,6 +1586,13 @@ public final class CraftServer implements Server {
@@ -43,7 +43,7 @@ index cc8dfcc4..fbd444da 100644
          try {
              if (message.startsWith("/")) {
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 45e908ed..e53e8013 100644
+index 45e908ed4..e53e8013d 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -156,4 +156,23 @@ public class SpigotConfig

CraftBukkit-Patches/0021-Configurable-Messages.patch

@@ -1,11 +1,11 @@
-From cab52aaa334bfed2150cb50f87a543a666db97db Mon Sep 17 00:00:00 2001
+From fadb04e8589050ca95361a9e685be5910e21223c Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 19:21:58 +1000
 Subject: [PATCH] Configurable Messages
 
 
 diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
-index 5deeca47..f72d4cf1 100644
+index 5deeca471..f72d4cf15 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
 @@ -63,11 +63,11 @@ public class HandshakeListener implements PacketHandshakingInListener {
@@ -23,10 +23,10 @@ index 5deeca47..f72d4cf1 100644
                  this.b.close(chatmessage);
              } else {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 03c654c7..191860c3 100644
+index e5a542bd0..b3385be3d 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -469,7 +469,7 @@ public abstract class PlayerList {
+@@ -470,7 +470,7 @@ public abstract class PlayerList {
              event.disallow(PlayerLoginEvent.Result.KICK_BANNED, CraftChatMessage.fromComponent(chatmessage));
          } else if (!this.isWhitelisted(gameprofile)) {
              chatmessage = new ChatMessage("multiplayer.disconnect.not_whitelisted", new Object[0]);
@@ -35,7 +35,7 @@ index 03c654c7..191860c3 100644
          } else if (getIPBans().isBanned(socketaddress) && !getIPBans().get(socketaddress).hasExpired()) {
              IpBanEntry ipbanentry = this.l.get(socketaddress);
  
-@@ -483,7 +483,7 @@ public abstract class PlayerList {
+@@ -484,7 +484,7 @@ public abstract class PlayerList {
          } else {
              // return this.players.size() >= this.maxPlayers && !this.f(gameprofile) ? new ChatMessage("multiplayer.disconnect.server_full", new Object[0]) : null;
              if (this.players.size() >= this.maxPlayers && !this.f(gameprofile)) {
@@ -45,7 +45,7 @@ index 03c654c7..191860c3 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index fbd444da..947d4608 100644
+index d306b7a8a..f3ef27da2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -688,11 +688,11 @@ public final class CraftServer implements Server {
@@ -65,7 +65,7 @@ index fbd444da..947d4608 100644
          return false;
      }
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index e53e8013..cec3c4b2 100644
+index e53e8013d..cec3c4b24 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -12,6 +12,7 @@ import java.util.Map;

CraftBukkit-Patches/0022-Properly-Close-Inventories.patch

@@ -1,4 +1,4 @@
-From 073e82defa7e5d115725dd9344f34c421c41cb09 Mon Sep 17 00:00:00 2001
+From 9eda0b173aa9b2eff3081de0f20cba5170eb30fa Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 27 Jun 2013 17:26:09 +1000
 Subject: [PATCH] Properly Close Inventories
@@ -6,7 +6,7 @@ Subject: [PATCH] Properly Close Inventories
 Properly close inventories when unloading and switching worlds.
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index a68fcec3..89b6d318 100644
+index 18110eecd..f3a768cf5 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -970,6 +970,21 @@ public class WorldServer extends World {

CraftBukkit-Patches/0023-Disallow-Interaction-With-Self.patch

@@ -1,11 +1,11 @@
-From 561560704cb8fd3f7a98ebdca149097713d1dcca Mon Sep 17 00:00:00 2001
+From 42436d1f99dbd8558399421d5021b3f57441a27f Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 28 Jun 2013 19:52:54 +1000
 Subject: [PATCH] Disallow Interaction With Self
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 98322d7e..726024d9 100644
+index 98322d7e4..726024d95 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1760,6 +1760,13 @@ public class PlayerConnection implements PacketListenerPlayIn {

CraftBukkit-Patches/0024-Entity-Mount-and-Dismount-Events.patch

@@ -1,14 +1,14 @@
-From c8f55e399a9cca301909d3403cd0d762b65ebf4d Mon Sep 17 00:00:00 2001
+From a0f40543be6cdcb5618f7e74efdad90d728828c0 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 27 Feb 2016 10:07:58 +1100
 Subject: [PATCH] Entity Mount and Dismount Events
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index e615403e..67218cda 100644
+index 6be92a50a..838f73f1f 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1896,6 +1896,16 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
+@@ -1895,6 +1895,16 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
                  }
              }
              // CraftBukkit end
@@ -25,7 +25,7 @@ index e615403e..67218cda 100644
              if (!this.world.isClientSide && entity instanceof EntityHuman && !(this.getRidingPassenger() instanceof EntityHuman)) {
                  this.passengers.add(0, entity);
              } else {
-@@ -1926,6 +1936,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
+@@ -1925,6 +1935,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
                  }
              }
              // CraftBukkit end

CraftBukkit-Patches/0025-Prevent-Ghost-Players-Caused-by-Plugins.patch

@@ -1,4 +1,4 @@
-From 0f58f4de291b3cbb5054422ae7f367246806eeb1 Mon Sep 17 00:00:00 2001
+From aeabacae5c38de51f79d01aa6eaa1f3ebd8e6b28 Mon Sep 17 00:00:00 2001
 From: Alex Ciuba <alexciuba@gmail.com>
 Date: Tue, 11 Jun 2013 15:23:03 -0400
 Subject: [PATCH] Prevent Ghost Players Caused by Plugins
@@ -6,10 +6,10 @@ Subject: [PATCH] Prevent Ghost Players Caused by Plugins
 Check if the player is still connected after firing event. Fixes BUKKIT-4327
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 191860c3..3aac1273 100644
+index b3385be3d..14e3a25ff 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -605,6 +605,11 @@ public abstract class PlayerList {
+@@ -609,6 +609,11 @@ public abstract class PlayerList {
              Player respawnPlayer = cserver.getPlayer(entityplayer1);
              PlayerRespawnEvent respawnEvent = new PlayerRespawnEvent(respawnPlayer, location, isBedSpawn);
              cserver.getPluginManager().callEvent(respawnEvent);

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

@@ -1,11 +1,11 @@
-From 087c53f9db400801621577355dff8c9bab20b80b Mon Sep 17 00:00:00 2001
+From 2454020369662736214921b6cb07a5e3e0c998bb Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 27 Mar 2016 20:35:09 +1100
 Subject: [PATCH] Player Collision API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f7f4f44d..4a678c41 100644
+index f7f4f44de..4a678c414 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1641,6 +1641,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

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

@@ -1,11 +1,11 @@
-From 146096d121a19f6e7a7f98fabf2afe1271c2ce93 Mon Sep 17 00:00:00 2001
+From d430bf7067884bd016b1fb32652960829ebcae00 Mon Sep 17 00:00:00 2001
 From: agentk20 <agentkid20@gmail.com>
 Date: Sat, 3 Aug 2013 19:28:48 +1000
 Subject: [PATCH] Fully Disable Snooper When Not Required
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e4c51a7c..b4c8a23b 100644
+index b725cc6e7..0f7fd8529 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -919,11 +919,11 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas

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

@@ -1,11 +1,11 @@
-From 0f1c7a07ce5388da96e30640a920fa3c0cb9c4ee Mon Sep 17 00:00:00 2001
+From e2468682c23597ff26c234e4a29dcc51237876b4 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 8d4cb269..d209902a 100644
+index 8d4cb2699..d209902ab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -915,6 +915,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {

CraftBukkit-Patches/0029-Don-t-Special-Case-X-Move-Value.patch

@@ -1,11 +1,11 @@
-From b8095d8a4227bdaf24774af687aee41ad5c243fb Mon Sep 17 00:00:00 2001
+From 2bdc7407aa51b0b9a3131fc0df34c87e503c642d Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 6 Oct 2013 17:36:28 +1100
 Subject: [PATCH] Don't Special Case X Move Value
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 726024d9..06b98699 100644
+index 726024d95..06b98699e 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -129,6 +129,7 @@ public class PlayerConnection implements PacketListenerPlayIn {

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

@@ -1,11 +1,11 @@
-From b91c205abca56f12d1277c52615374509c42f5a8 Mon Sep 17 00:00:00 2001
+From 1771bffe81e00d4052a6b8f81322deadbc603899 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 4a678c41..5a6a040f 100644
+index 4a678c414..5a6a040fe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1651,6 +1651,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

CraftBukkit-Patches/0031-Arrow-Despawn-Rate.patch

@@ -1,14 +1,14 @@
-From bda5c6234225e5aaba06703a5a1b4fce51194f67 Mon Sep 17 00:00:00 2001
+From e7c9972880668d0bc00bbbeb5a62b83d7071572a Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Mon, 14 Oct 2013 19:20:10 +1100
 Subject: [PATCH] Arrow Despawn Rate
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index 4767f7b3..1575e9f5 100644
+index c6c9e79fa..bc391812d 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
-@@ -262,7 +262,7 @@ public abstract class EntityArrow extends Entity implements IProjectile {
+@@ -263,7 +263,7 @@ public abstract class EntityArrow extends Entity implements IProjectile {
  
      protected void i() {
          ++this.despawnCounter;
@@ -18,7 +18,7 @@ index 4767f7b3..1575e9f5 100644
          }
  
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 62b75e33..313aca15 100644
+index 62b75e33a..313aca152 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -190,4 +190,11 @@ public class SpigotWorldConfig

CraftBukkit-Patches/0032-Watchdog-Thread.patch

@@ -1,11 +1,11 @@
-From d74d1e654dafa405914e3b563592de9d550c4c25 Mon Sep 17 00:00:00 2001
+From 664f880f84a0cd945d60efa7b0e3648dd3e83538 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 5 Aug 2014 17:20:19 +0100
 Subject: [PATCH] Watchdog Thread.
 
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 213312b3..3f74c1c1 100644
+index 213312b38..3f74c1c1e 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -268,7 +268,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -18,7 +18,7 @@ index 213312b3..3f74c1c1 100644
  
                  thread1.setUncaughtExceptionHandler(new ThreadNamedUncaughtExceptionHandler(DedicatedServer.LOGGER));
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b4c8a23b..cda73d9c 100644
+index 0f7fd8529..d690983c8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -785,6 +785,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -38,7 +38,7 @@ index b4c8a23b..cda73d9c 100644
          org.spigotmc.CustomTimingsHandler.tick(); // Spigot
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 947d4608..176a7e9c 100644
+index f3ef27da2..f483b186f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1898,6 +1898,11 @@ public final class CraftServer implements Server {
@@ -55,7 +55,7 @@ index 947d4608..176a7e9c 100644
      public Spigot spigot()
 diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
 new file mode 100644
-index 00000000..e7b953ca
+index 000000000..e7b953ca3
 --- /dev/null
 +++ b/src/main/java/org/spigotmc/RestartCommand.java
 @@ -0,0 +1,130 @@
@@ -190,7 +190,7 @@ index 00000000..e7b953ca
 +    }
 +}
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index cec3c4b2..d8145db9 100644
+index cec3c4b24..d8145db91 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -200,4 +200,18 @@ public class SpigotConfig
@@ -214,7 +214,7 @@ index cec3c4b2..d8145db9 100644
  }
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
 new file mode 100644
-index 00000000..df33e151
+index 000000000..df33e151c
 --- /dev/null
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -0,0 +1,127 @@

CraftBukkit-Patches/0033-Fix-Broken-Async-Chat.patch

@@ -1,11 +1,11 @@
-From 73aa9be197d874fbb269fbec9ed7b01039a710e6 Mon Sep 17 00:00:00 2001
+From 839176b92a5d785f1b99fee9976cf1e86e731348 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 5 Dec 2013 13:55:53 +1100
 Subject: [PATCH] Fix Broken Async Chat
 
 
 diff --git a/src/main/java/net/minecraft/server/PacketPlayInChat.java b/src/main/java/net/minecraft/server/PacketPlayInChat.java
-index 699815b3..b2ca841b 100644
+index 699815b3d..b2ca841b4 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayInChat.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayInChat.java
 @@ -26,7 +26,24 @@ public class PacketPlayInChat implements Packet<PacketListenerPlayIn> {

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

@@ -1,11 +1,11 @@
-From a9ab57f0f4092e5cc7a93c781c29f30bcb08a30a Mon Sep 17 00:00:00 2001
+From 4066cdbd7d938885975389ebac267cd75cf5e0e8 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
 
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 4dda0334..65e085d4 100644
+index f1831e37e..11a18196d 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -92,10 +92,23 @@ public class LoginListener implements PacketLoginInListener {
@@ -91,11 +91,11 @@ index 4dda0334..65e085d4 100644
 -                                }
 -                            }
 -                            // CraftBukkit end
--                            LoginListener.c.info("UUID of player {} is {}", LoginListener.this.i.getName(), LoginListener.this.i.getId());
+-                            LoginListener.LOGGER.info("UUID of player {} is {}", LoginListener.this.i.getName(), LoginListener.this.i.getId());
 -                            LoginListener.this.g = LoginListener.EnumProtocolState.READY_TO_ACCEPT;
 +                            new LoginHandler().fireEvents();
                          } else if (LoginListener.this.server.isEmbeddedServer()) {
-                             LoginListener.c.warn("Failed to verify username but will let them in anyway!");
+                             LoginListener.LOGGER.warn("Failed to verify username but will let them in anyway!");
                              LoginListener.this.i = LoginListener.this.a(gameprofile);
 @@ -244,7 +238,48 @@ public class LoginListener implements PacketLoginInListener {
          }
@@ -138,7 +138,7 @@ index 4dda0334..65e085d4 100644
 +                                }
 +                            }
 +                            // CraftBukkit end
-+                            LoginListener.c.info("UUID of player {} is {}", LoginListener.this.i.getName(), LoginListener.this.i.getId());
++                            LoginListener.LOGGER.info("UUID of player {} is {}", LoginListener.this.i.getName(), LoginListener.this.i.getId());
 +                            LoginListener.this.g = LoginListener.EnumProtocolState.READY_TO_ACCEPT;
 +                }
 +        }

CraftBukkit-Patches/0035-BungeeCord-Support.patch

@@ -1,4 +1,4 @@
-From f8a9efd76ae4c67136b0847e6708ddaf6b0f6514 Mon Sep 17 00:00:00 2001
+From 3e656581d12e810da6ddf0375bbca4f354d2b249 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
@@ -6,7 +6,7 @@ Subject: [PATCH] BungeeCord Support
 Provides support for IP forwarding via BungeeCord.
 
 diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
-index f72d4cf1..1ef8e865 100644
+index f72d4cf15..1ef8e8653 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
 @@ -7,6 +7,7 @@ import java.util.HashMap;
@@ -45,7 +45,7 @@ index f72d4cf1..1ef8e865 100644
              }
              break;
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 65e085d4..b67d54f9 100644
+index 11a18196d..b85b048ac 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -95,9 +95,24 @@ public class LoginListener implements PacketLoginInListener {
@@ -75,7 +75,7 @@ index 65e085d4..b67d54f9 100644
      // Spigot end
  
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 8fb98b13..0c35ee07 100644
+index 1b46c7d97..374749b16 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -47,6 +47,10 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -102,7 +102,7 @@ index 8fb98b13..0c35ee07 100644
 +    // Spigot End
  }
 diff --git a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
-index 6aeea22a..4f008e47 100644
+index 6aeea22ae..4f008e472 100644
 --- a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
 +++ b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
 @@ -14,7 +14,7 @@ public class PacketHandshakingInSetProtocol implements Packet<PacketHandshakingI
@@ -115,10 +115,10 @@ index 6aeea22a..4f008e47 100644
          this.d = EnumProtocol.a(packetdataserializer.i());
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 3aac1273..c80663d0 100644
+index 14e3a25ff..0e30ac811 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -455,7 +455,7 @@ public abstract class PlayerList {
+@@ -456,7 +456,7 @@ public abstract class PlayerList {
  
          EntityPlayer entity = new EntityPlayer(this.server, this.server.getWorldServer(DimensionManager.OVERWORLD), gameprofile, new PlayerInteractManager(this.server.getWorldServer(DimensionManager.OVERWORLD)));
          Player player = entity.getBukkitEntity();
@@ -128,7 +128,7 @@ index 3aac1273..c80663d0 100644
          if (getProfileBans().isBanned(gameprofile) && !getProfileBans().get(gameprofile).hasExpired()) {
              GameProfileBanEntry gameprofilebanentry = (GameProfileBanEntry) this.k.get(gameprofile);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 176a7e9c..ce04cf14 100644
+index f483b186f..b669744d7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -620,7 +620,13 @@ public final class CraftServer implements Server {
@@ -147,7 +147,7 @@ index 176a7e9c..ce04cf14 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 5a6a040f..f939d330 100644
+index 5a6a040fe..f939d3301 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1642,6 +1642,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -164,7 +164,7 @@ index 5a6a040f..f939d330 100644
          public boolean getCollidesWithEntities() {
              return CraftPlayer.this.isCollidable();
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index d8145db9..06081dc6 100644
+index d8145db91..06081dc64 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -214,4 +214,14 @@ public class SpigotConfig

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

@@ -1,4 +1,4 @@
-From 978ef4a9f48a83dd2fda5b5a4c360e2c4c7b46e5 Mon Sep 17 00:00:00 2001
+From cca13d487469b9035185b6db1b6cff9836ec57ec 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow Disabling Zombie Villager Aggression
 Ability to configure if Zombies will be aggressive towards Villagers.
 
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index a45b7c7e..21df3ef2 100644
+index a45b7c7e0..21df3ef2c 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -55,7 +55,7 @@ public class EntityZombie extends EntityMonster {
@@ -19,7 +19,7 @@ index a45b7c7e..21df3ef2 100644
          this.targetSelector.a(5, new PathfinderGoalNearestAttackableTarget<>(this, EntityTurtle.class, 10, true, false, EntityTurtle.bz));
      }
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 313aca15..f8f3b894 100644
+index 313aca152..f8f3b8944 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -197,4 +197,11 @@ public class SpigotWorldConfig

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

@@ -1,4 +1,4 @@
-From 11fd9cf5cd466dc88c82ab9803c1b43eec2c8daa Mon Sep 17 00:00:00 2001
+From a9aca8765835a16e3a357e07c3fcb47547627258 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 cda73d9c..e36e8a3b 100644
+index d690983c8..9d355d699 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -173,7 +173,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -28,7 +28,7 @@ index cda73d9c..e36e8a3b 100644
  
      public boolean ah() {
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 06081dc6..a4200e43 100644
+index 06081dc64..a4200e43e 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -224,4 +224,11 @@ public class SpigotConfig

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

@@ -1,11 +1,11 @@
-From b3edf521c2ccc1e9e2396e95e42c59609c2724b3 Mon Sep 17 00:00:00 2001
+From 2ca706268417f009fe1ce31713ce1fb06665d700 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 e36e8a3b..485404d8 100644
+index 9d355d699..89ff35b41 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -766,6 +766,12 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas

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

@@ -1,14 +1,14 @@
-From b9ce541aaa327b9c89264260a4f0c5a6d2e8b375 Mon Sep 17 00:00:00 2001
+From eb4edb19a18cb2403b08b383a695731342384c3b 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
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 67218cda..cc66943d 100644
+index 838f73f1f..b27d6b2c3 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1470,6 +1470,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
+@@ -1469,6 +1469,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
              nbttagcompound.setLong("WorldUUIDLeast", ((WorldServer) this.world).getDataManager().getUUID().getLeastSignificantBits());
              nbttagcompound.setLong("WorldUUIDMost", ((WorldServer) this.world).getDataManager().getUUID().getMostSignificantBits());
              nbttagcompound.setInt("Bukkit.updateLevel", CURRENT_LEVEL);
@@ -16,7 +16,7 @@ index 67218cda..cc66943d 100644
              // CraftBukkit end
              IChatBaseComponent ichatbasecomponent = this.getCustomName();
  
-@@ -1616,6 +1617,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
+@@ -1615,6 +1616,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
              if (this instanceof EntityLiving) {
                  EntityLiving entity = (EntityLiving) this;
  

CraftBukkit-Patches/0040-Add-Option-to-Nerf-Mobs-from-Spawners.patch

@@ -1,14 +1,14 @@
-From 378bccc0fdf524b294eb7bc11b490798d6b1db88 Mon Sep 17 00:00:00 2001
+From 9128765b365eee6d35802070a4aa1b5cb799a11a 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 Spawners
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index cc66943d..43dc487e 100644
+index b27d6b2c3..bc9894f84 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -164,6 +164,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
+@@ -163,6 +163,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
      public final byte activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
      public final boolean defaultActivationState;
      public long activatedTick = Integer.MIN_VALUE;
@@ -17,7 +17,7 @@ index cc66943d..43dc487e 100644
      // Spigot end
  
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 39fdf888..47206326 100644
+index 39fdf888d..472063264 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -636,6 +636,12 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -34,7 +34,7 @@ index 39fdf888..47206326 100644
          this.bz.a();
          this.world.getMethodProfiler().exit();
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index 0aebd850..bc2ee3dc 100644
+index cb6d72ece..65bb855bd 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -128,7 +128,12 @@ public abstract class MobSpawnerAbstract {
@@ -52,7 +52,7 @@ index 0aebd850..bc2ee3dc 100644
                          world.triggerEffect(2004, blockposition, 0);
                          if (entity instanceof EntityInsentient) {
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index f8f3b894..cd705235 100644
+index f8f3b8944..cd705235d 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -204,4 +204,11 @@ public class SpigotWorldConfig

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

@@ -1,11 +1,11 @@
-From 7e56b82d3af82792cd239874ba0b7f996531bbb9 Mon Sep 17 00:00:00 2001
+From 2d4c157cf82dfd693df01b0c4927bb16c18ff03b 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 f939d330..ec44fa14 100644
+index f939d3301..ec44fa143 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1423,7 +1423,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

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

@@ -1,4 +1,4 @@
-From 0c104a0cea092ee8ac6c7d4d0caebf357cec8e30 Mon Sep 17 00:00:00 2001
+From 1d846c3043b77bd8f877aca0d2cbe92d8b45d336 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Add Late Bind Option
 Add late-bind config option to delay binding until loading is done.
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 3f74c1c1..aac04452 100644
+index 3f74c1c1e..aac04452e 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -178,6 +178,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -44,7 +44,7 @@ index 3f74c1c1..aac04452 100644
                  Thread thread1 = new Thread(new ThreadWatchdog(this));
  
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index a4200e43..33f0e3b8 100644
+index a4200e43e..33f0e3b87 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -231,4 +231,9 @@ public class SpigotConfig

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

@@ -1,11 +1,11 @@
-From 0627fd57d72f37b7578ac57527c66948885b2451 Mon Sep 17 00:00:00 2001
+From 49e74e6dc9afe6734c8ad8608b75f19e3baaa13a 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
 
 
 diff --git a/src/main/java/net/minecraft/server/ServerStatisticManager.java b/src/main/java/net/minecraft/server/ServerStatisticManager.java
-index 5899cd49..a3bb3487 100644
+index aa9bbfd1c..b303700fc 100644
 --- a/src/main/java/net/minecraft/server/ServerStatisticManager.java
 +++ b/src/main/java/net/minecraft/server/ServerStatisticManager.java
 @@ -34,6 +34,13 @@ public class ServerStatisticManager extends StatisticManager {
@@ -39,7 +39,7 @@ index 5899cd49..a3bb3487 100644
          this.e.add(statistic);
      }
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 33f0e3b8..f814e19e 100644
+index 33f0e3b87..f814e19e8 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -10,10 +10,13 @@ import java.util.HashMap;

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

@@ -1,11 +1,11 @@
-From cfcd10332d706d274822aab81eff69e591f8f90f Mon Sep 17 00:00:00 2001
+From 5f7e3769d6c04d74ca2a34a1fe004363c8f910d4 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 12 Jan 2014 20:56:41 +1100
 Subject: [PATCH] Try and Debug Crash Reports Crashing
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 485404d8..ba3d0054 100644
+index 89ff35b41..4fb24a270 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1002,7 +1002,14 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas

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

@@ -1,11 +1,11 @@
-From e1dcf843bef659608ea65c25468a5a1c6cc6e3a6 Mon Sep 17 00:00:00 2001
+From 7a417df41e42de32fe0469870ccbb1c41f30e460 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.
 
 
 diff --git a/src/main/java/net/minecraft/server/NBTTagByteArray.java b/src/main/java/net/minecraft/server/NBTTagByteArray.java
-index cd531412..1110b277 100644
+index cd5314121..1110b277f 100644
 --- a/src/main/java/net/minecraft/server/NBTTagByteArray.java
 +++ b/src/main/java/net/minecraft/server/NBTTagByteArray.java
 @@ -43,6 +43,7 @@ public class NBTTagByteArray extends NBTList<NBTTagByte> {
@@ -17,7 +17,7 @@ index cd531412..1110b277 100644
          nbtreadlimiter.a((long) (8 * j));
          this.data = new byte[j];
 diff --git a/src/main/java/net/minecraft/server/NBTTagIntArray.java b/src/main/java/net/minecraft/server/NBTTagIntArray.java
-index 36a9edd2..e3ed32aa 100644
+index 36a9edd2e..e3ed32aa7 100644
 --- a/src/main/java/net/minecraft/server/NBTTagIntArray.java
 +++ b/src/main/java/net/minecraft/server/NBTTagIntArray.java
 @@ -51,6 +51,7 @@ public class NBTTagIntArray extends NBTList<NBTTagInt> {

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

@@ -1,11 +1,11 @@
-From 6a56d5bcf8e1b74204f621baa9593dec8c8786b8 Mon Sep 17 00:00:00 2001
+From 4284691f3e6d3a6b88221a0feb3cd6553607b43a 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
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockPortal.java b/src/main/java/net/minecraft/server/BlockPortal.java
-index 1a13be56..ae3dd757 100644
+index 1a13be56f..ae3dd757e 100644
 --- a/src/main/java/net/minecraft/server/BlockPortal.java
 +++ b/src/main/java/net/minecraft/server/BlockPortal.java
 @@ -34,7 +34,7 @@ public class BlockPortal extends Block {
@@ -18,7 +18,7 @@ index 1a13be56..ae3dd757 100644
                  blockposition = blockposition.down();
              }
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index cd705235..1b9be748 100644
+index cd705235d..1b9be7488 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -211,4 +211,11 @@ public class SpigotWorldConfig

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

@@ -1,11 +1,11 @@
-From 69e2070103215c10b09bc50bf6322e3d3e28c01d Mon Sep 17 00:00:00 2001
+From 0c12b7dc27ea6e4b6e89fd8ca6f818f9be7b8249 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Thu, 26 Jan 2017 21:50:51 +0000
 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 ba3d0054..456aa3f5 100644
+index 4fb24a270..ac20ce7d6 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -153,6 +153,12 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -66,7 +66,7 @@ index ba3d0054..456aa3f5 100644
                      this.nextTick += 50L;
                      if (this.T) {
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index f814e19e..759f01c9 100644
+index f814e19e8..759f01c92 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -271,4 +271,9 @@ public class SpigotConfig
@@ -81,7 +81,7 @@ index f814e19e..759f01c9 100644
  }
 diff --git a/src/main/java/org/spigotmc/TicksPerSecondCommand.java b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
 new file mode 100644
-index 00000000..be2e31de
+index 000000000..be2e31dea
 --- /dev/null
 +++ b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
 @@ -0,0 +1,45 @@

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

@@ -1,11 +1,11 @@
-From f4d5bf2979948d2aa10c34f41c672fcee3b35b6a Mon Sep 17 00:00:00 2001
+From 05125761aabc777f7dfcc7b00e10340c4762c21e Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 26 Jan 2014 21:48:34 +1100
 Subject: [PATCH] Configurable Ping Sample Size
 
 
 diff --git a/src/main/java/net/minecraft/server/PacketStatusListener.java b/src/main/java/net/minecraft/server/PacketStatusListener.java
-index a5336a2c..b247a18b 100644
+index a5336a2c8..b247a18b9 100644
 --- a/src/main/java/net/minecraft/server/PacketStatusListener.java
 +++ b/src/main/java/net/minecraft/server/PacketStatusListener.java
 @@ -110,6 +110,13 @@ public class PacketStatusListener implements PacketStatusInListener {
@@ -23,7 +23,7 @@ index a5336a2c..b247a18b 100644
  
              ServerPing ping = new ServerPing();
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 759f01c9..f113fed0 100644
+index 759f01c92..f113fed05 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -276,4 +276,11 @@ public class SpigotConfig

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

@@ -1,4 +1,4 @@
-From 80ed3235e1d69fc1f30fdebb377113cdb930b3e3 Mon Sep 17 00:00:00 2001
+From 24a2cdd426c24f0e08d8647d5c82e4715588b074 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Add Optional Tick Shuffling
 This prevents players from 'gaming' the server, and strategically relogging to increase their position in the tick order.
 
 diff --git a/src/main/java/net/minecraft/server/ServerConnection.java b/src/main/java/net/minecraft/server/ServerConnection.java
-index 08df04b7..42b4974d 100644
+index e64f8115c..ebd29d0ea 100644
 --- a/src/main/java/net/minecraft/server/ServerConnection.java
 +++ b/src/main/java/net/minecraft/server/ServerConnection.java
 @@ -101,6 +101,13 @@ public class ServerConnection {
@@ -24,7 +24,7 @@ index 08df04b7..42b4974d 100644
  
              while (iterator.hasNext()) {
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index f113fed0..cff1da74 100644
+index f113fed05..cff1da746 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -283,4 +283,10 @@ public class SpigotConfig

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

@@ -1,11 +1,11 @@
-From ad88fea499950132f074289ba748ef3fef4f0ebe Mon Sep 17 00:00:00 2001
+From 954c4ccc670eeaeaa779385fc70367e22baef3c4 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/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ec44fa14..151917af 100644
+index ec44fa143..151917afb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1666,6 +1666,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

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

@@ -1,11 +1,11 @@
-From b1137f5bebe9bf9d3d68620421478dcdb1d87c25 Mon Sep 17 00:00:00 2001
+From e33759c6a1d9c97bddbf19385ba2385f83f07932 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 06b98699..57a83e02 100644
+index 06b98699e..57a83e02d 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1510,9 +1510,20 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -31,7 +31,7 @@ index 06b98699..57a83e02 100644
                      Waitable waitable = new Waitable() {
                          @Override
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index cff1da74..20a83a6f 100644
+index cff1da746..20a83a6fc 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -6,6 +6,7 @@ import java.io.IOException;

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

@@ -1,11 +1,11 @@
-From a369df447d7673e48688e3f07f24e082b215d080 Mon Sep 17 00:00:00 2001
+From 53743748564b81cdba00988bba703d7829d00b03 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
 
 
 diff --git a/src/main/java/net/minecraft/server/CommandListenerWrapper.java b/src/main/java/net/minecraft/server/CommandListenerWrapper.java
-index 811e9ced..783ea46b 100644
+index 811e9ced1..783ea46b6 100644
 --- a/src/main/java/net/minecraft/server/CommandListenerWrapper.java
 +++ b/src/main/java/net/minecraft/server/CommandListenerWrapper.java
 @@ -205,7 +205,7 @@ public class CommandListenerWrapper implements ICompletionProvider {
@@ -18,7 +18,7 @@ index 811e9ced..783ea46b 100644
          }
  
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 20a83a6f..161a0247 100644
+index 20a83a6fc..161a02478 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -299,4 +299,10 @@ public class SpigotConfig

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

@@ -1,11 +1,11 @@
-From fcd4e54508c386eb8439a544f144ccb8d3b41444 Mon Sep 17 00:00:00 2001
+From 2c8a26d7339745d739ed859dd202eef08033e95e 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 151917af..7402ff3a 100644
+index 151917afb..7402ff3a3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1672,6 +1672,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

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

@@ -1,11 +1,11 @@
-From 9e4289c68ada0efdd4e7eb09b399ca7649cb013d Mon Sep 17 00:00:00 2001
+From 437a32fed9cec58b5fac1faacf23fb57581d57be 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 ce04cf14..a9983f95 100644
+index b669744d7..533d4504e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -372,8 +372,11 @@ public final class CraftServer implements Server {
@@ -46,7 +46,7 @@ index ce04cf14..a9983f95 100644
      }
  
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 161a0247..f550ebdf 100644
+index 161a02478..f550ebdf2 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -8,8 +8,10 @@ import java.lang.reflect.Method;

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

@@ -1,11 +1,11 @@
-From a813e95858921d61dcf248f3d7a006d7ab0c26aa Mon Sep 17 00:00:00 2001
+From f669eab3e306f613a5e3858fcb74fe90c7cdc2d2 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLightning.java b/src/main/java/net/minecraft/server/EntityLightning.java
-index 11c73af4..adf68d16 100644
+index 11c73af45..adf68d165 100644
 --- a/src/main/java/net/minecraft/server/EntityLightning.java
 +++ b/src/main/java/net/minecraft/server/EntityLightning.java
 @@ -16,6 +16,7 @@ public class EntityLightning extends Entity {
@@ -41,7 +41,7 @@ index 11c73af4..adf68d16 100644
              // this.world.a((EntityHuman) null, this.locX, this.locY, this.locZ, SoundEffects.ENTITY_LIGHTNING_BOLT_THUNDER, SoundCategory.WEATHER, 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 c4df3535..cf12b4b5 100644
+index c4df35351..cf12b4b55 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1938,6 +1938,22 @@ public class CraftWorld implements World {
@@ -68,7 +68,7 @@ index c4df3535..cf12b4b5 100644
  
      public Spigot spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
-index 194d830e..ddd5ccd5 100644
+index 194d830e1..ddd5ccd58 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
 @@ -31,6 +31,11 @@ public class CraftLightningStrike extends CraftEntity implements LightningStrike

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

@@ -1,11 +1,11 @@
-From 4ca354e7403fa8abe1b5c193f3e6d4a04c769dee Mon Sep 17 00:00:00 2001
+From 6af17559b055deb53564b9d38433a489e7fb919d 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
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java b/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
-index 8668d149..d52b59e0 100644
+index 8668d149f..d52b59e0a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
 @@ -11,9 +11,18 @@ import org.bukkit.permissions.PermissionAttachmentInfo;

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

@@ -1,14 +1,14 @@
-From d0992af62c20ce14eb8979a4aba1cdb4792ed353 Mon Sep 17 00:00:00 2001
+From 3214859b868aa46bfbfcf7b9d3314c30dd8855a7 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
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
-index 6101bc60..3502e7a4 100644
+index db6b0ecfe..0ecfbcb4b 100644
 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java
 +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
-@@ -454,6 +454,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
+@@ -456,6 +456,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
      public static IInventory a(World world, double d0, double d1, double d2) {
          Object object = null;
          BlockPosition blockposition = new BlockPosition(d0, d1, d2);

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

@@ -1,11 +1,11 @@
-From 2ff2953778671ea887ddb2071aafa9660aa63189 Mon Sep 17 00:00:00 2001
+From cc727935fa2147c448aaed1e41b984f6b3101136 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityWitherSkull.java b/src/main/java/net/minecraft/server/EntityWitherSkull.java
-index 000a8f95..9610c059 100644
+index 000a8f95c..9610c0598 100644
 --- a/src/main/java/net/minecraft/server/EntityWitherSkull.java
 +++ b/src/main/java/net/minecraft/server/EntityWitherSkull.java
 @@ -35,8 +35,11 @@ public class EntityWitherSkull extends EntityFireball {

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

@@ -1,11 +1,11 @@
-From 7614e11ec79276e9409750673e26c959c62b7887 Mon Sep 17 00:00:00 2001
+From c328334212143351059c399fcbfca2c597904d60 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index 5a30d4a9..156bf53a 100644
+index 782b20c14..245b1d100 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -556,7 +556,24 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@@ -35,7 +35,7 @@ index 5a30d4a9..156bf53a 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
-index e2c5ae0c..f23f0943 100644
+index e2c5ae0ce..f23f09430 100644
 --- a/src/main/java/net/minecraft/server/EntityWither.java
 +++ b/src/main/java/net/minecraft/server/EntityWither.java
 @@ -212,6 +212,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -47,7 +47,7 @@ index e2c5ae0c..f23f0943 100644
                          double deltaLength = Math.sqrt(distanceSquared);
                          double relativeX = player.locX + (deltaX / deltaLength) * viewDistance;
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 1b9be748..ee6c4d56 100644
+index 1b9be7488..ee6c4d565 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -218,4 +218,16 @@ public class SpigotWorldConfig

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

@@ -1,4 +1,4 @@
-From f986d356428c97f5dc93d58cc8f72b26963c96ae Mon Sep 17 00:00:00 2001
+From bfaa0d7dc3b82bcd44c45d76e55500386b9d538e 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 456aa3f5..5b2903c6 100644
+index ac20ce7d6..d6bbbf6e1 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1245,7 +1245,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas

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

@@ -1,11 +1,11 @@
-From 265e0c30d3bb81b6708690e25b6faf9bb83a001a Mon Sep 17 00:00:00 2001
+From c266c3ad548c7dc25b262094511395700d302994 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
 
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index aac04452..e1ba833f 100644
+index aac04452e..e1ba833f3 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -198,7 +198,14 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -25,7 +25,7 @@ index aac04452..e1ba833f 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
-index c7f94817..8c4ce931 100644
+index 69fa57972..1dd793d2f 100644
 --- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
 +++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
 @@ -57,7 +57,7 @@ public class NameReferencingFileConverter {

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

@@ -1,11 +1,11 @@
-From 32366481ecef6bd8bb63084e03285163a94adb33 Mon Sep 17 00:00:00 2001
+From 1e6a9f01c9f133abb6116cb5e735f63690098ed9 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
 
 
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 0c35ee07..cbe481af 100644
+index 374749b16..483186725 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -117,6 +117,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {

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

@@ -1,4 +1,4 @@
-From e04964f965f3c25216282f17b1e2d75361b355e5 Mon Sep 17 00:00:00 2001
+From 0f8846e59eed1d0c68287b56671c9dce7b0f3ff0 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.
@@ -6,7 +6,7 @@ Subject: [PATCH] Use Offline Player Data Once if Required.
 If we are online mode and the only copy of player data we can find is the player's offline mode data, we will attempt a once off conversion by reading this data and then renaming the file so it won't be used again.
 
 diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
-index 671fa2f9..8ea30312 100644
+index 1f09bf020..f965ff64b 100644
 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
 +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
 @@ -162,10 +162,28 @@ public class WorldNBTStorage implements IPlayerFileData {
@@ -36,7 +36,7 @@ index 671fa2f9..8ea30312 100644
 +            }
 +            // Spigot End
          } catch (Exception exception) {
-             WorldNBTStorage.b.warn("Failed to load player data for {}", entityhuman.getDisplayName().getString());
+             WorldNBTStorage.LOGGER.warn("Failed to load player data for {}", entityhuman.getDisplayName().getString());
          }
 -- 
 2.20.1

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

@@ -1,11 +1,11 @@
-From 9842d9f25a3f8a5786a3881d9e258648d2e30849 Mon Sep 17 00:00:00 2001
+From 4df37a54d4c36c47872dc7fec4db3e8a52ec598f 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
 
 
 diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
-index 3c7646de..7a555ba2 100644
+index 3c7646de4..7a555ba26 100644
 --- a/src/main/java/net/minecraft/server/UserCache.java
 +++ b/src/main/java/net/minecraft/server/UserCache.java
 @@ -153,7 +153,7 @@ public class UserCache {

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

@@ -1,4 +1,4 @@
-From 4f21830ec73984c819ac3238ce82ecc04b7ba80a Mon Sep 17 00:00:00 2001
+From def8fc01e0dd98ebf310cc88a3cd5b6cfc3bc063 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix Player Banning
 This issue stems from the fact that Bukkit's API only allows a UUID to be banned, but Minecraft requires both a UUID and name. To fix this we modify the code to require a UUID or a name, or both. The correct fix would be expanding the API to be able to provide a name, however this would require plugin changes.
 
 diff --git a/src/main/java/net/minecraft/server/GameProfileBanEntry.java b/src/main/java/net/minecraft/server/GameProfileBanEntry.java
-index 0cc70104..120c7176 100644
+index 0cc701042..120c71766 100644
 --- a/src/main/java/net/minecraft/server/GameProfileBanEntry.java
 +++ b/src/main/java/net/minecraft/server/GameProfileBanEntry.java
 @@ -38,20 +38,29 @@ public class GameProfileBanEntry extends ExpirableListEntry<GameProfile> {

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

@@ -1,14 +1,14 @@
-From 057c24f40c8aa72e8997febad4fdc7b9af2d98d5 Mon Sep 17 00:00:00 2001
+From 6df9c989cf4be8ce5c9f2e9cfe68a49fddc3e698 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 c80663d0..06459ccc 100644
+index 0e30ac811..abe86b502 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -466,7 +466,7 @@ public abstract class PlayerList {
+@@ -467,7 +467,7 @@ public abstract class PlayerList {
              }
  
              // return chatmessage;

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

@@ -1,11 +1,11 @@
-From 900ae657f78117abd81f3e1a61ee83eae39f1495 Mon Sep 17 00:00:00 2001
+From 9cca9e522aa88268082d23d0466fb95ac7e09744 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
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 208cdca4..df46dbca 100644
+index d3717d3a4..888c9605c 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -173,7 +173,14 @@ public abstract class TileEntity {

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

@@ -1,11 +1,11 @@
-From 78fedf8af97e922f5235166e861a7988694dd658 Mon Sep 17 00:00:00 2001
+From b5b07a62484cbb8cca3c7bd154f6479260148fdb 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
 
 
 diff --git a/src/main/java/net/minecraft/server/ItemSkullPlayer.java b/src/main/java/net/minecraft/server/ItemSkullPlayer.java
-index 307b439e..1e35cfe3 100644
+index 307b439e2..1e35cfe33 100644
 --- a/src/main/java/net/minecraft/server/ItemSkullPlayer.java
 +++ b/src/main/java/net/minecraft/server/ItemSkullPlayer.java
 @@ -40,8 +40,16 @@ public class ItemSkullPlayer extends ItemBlockWallable {
@@ -28,7 +28,7 @@ index 307b439e..1e35cfe3 100644
          } else {
              // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java
-index 0ad0c183..369fdfe6 100644
+index 0ad0c183c..369fdfe67 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySkull.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySkull.java
 @@ -7,6 +7,23 @@ import com.mojang.authlib.properties.Property;
@@ -201,7 +201,7 @@ index 0ad0c183..369fdfe6 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-index c63d0e61..63ec8d06 100644
+index c63d0e610..63ec8d06e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 @@ -77,7 +77,8 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {

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

@@ -1,11 +1,11 @@
-From c4111612e0014237a2870c8002b951b198c4373d Mon Sep 17 00:00:00 2001
+From 192638415bd49e30658157c4d6c1f2129bff6799 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
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 6ad9a9b6..8a9b1b65 100644
+index 8a295b346..9c507b312 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -87,6 +87,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
@@ -43,7 +43,7 @@ index 6ad9a9b6..8a9b1b65 100644
                  CrashReport crashreport = CrashReport.a(throwable, "Exception while updating neighbours");
                  CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Block being updated");
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index df33e151..27297204 100644
+index df33e151c..27297204f 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -70,6 +70,13 @@ public class WatchdogThread extends Thread

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

@@ -1,4 +1,4 @@
-From a8f695e10c902f6effe01d7f6a194e00ef4c24c7 Mon Sep 17 00:00:00 2001
+From 9272ba65ccd616d5b161caf60b40b8c2b2dbafc8 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
@@ -12,7 +12,7 @@ initialized. The ServerConnection does not remove NetworkManagers with
 this flag.
 
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index cbe481af..4d4b5a3b 100644
+index 483186725..248660da8 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -50,6 +50,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -44,7 +44,7 @@ index cbe481af..4d4b5a3b 100644
              this.channel.close(); // We can't wait as this may be called from an event loop.
              this.n = ichatbasecomponent;
 diff --git a/src/main/java/net/minecraft/server/ServerConnection.java b/src/main/java/net/minecraft/server/ServerConnection.java
-index 42b4974d..f6c6b1bb 100644
+index ebd29d0ea..42c654a1d 100644
 --- a/src/main/java/net/minecraft/server/ServerConnection.java
 +++ b/src/main/java/net/minecraft/server/ServerConnection.java
 @@ -135,6 +135,10 @@ public class ServerConnection {

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

@@ -1,11 +1,11 @@
-From d0abdf09ee88a4e7abed78aa8a8095bb337d4616 Mon Sep 17 00:00:00 2001
+From cf0faa50b9f38ec557be3e00dd9c959a0bafb341 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
 
 
 diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
-index 7a555ba2..52b9ddea 100644
+index 7a555ba26..52b9ddeae 100644
 --- a/src/main/java/net/minecraft/server/UserCache.java
 +++ b/src/main/java/net/minecraft/server/UserCache.java
 @@ -216,7 +216,7 @@ public class UserCache {
@@ -18,7 +18,7 @@ index 7a555ba2..52b9ddea 100644
  
          try {
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index f550ebdf..f9a4d224 100644
+index f550ebdf2..f9a4d2246 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -319,4 +319,10 @@ public class SpigotConfig

CraftBukkit-Patches/0072-Implement-PlayerSpawnLocationEvent.patch

@@ -1,14 +1,14 @@
-From 959b2e6bf13e4d665d4992c9bd52e7bd25f22698 Mon Sep 17 00:00:00 2001
+From 1f81777c95c93c20833acb98838fdc7f5dd7cb7f 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 06459ccc..baa08abd 100644
+index abe86b502..3fc84c7ed 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -37,6 +37,7 @@ import org.bukkit.event.player.PlayerQuitEvent;
+@@ -38,6 +38,7 @@ import org.bukkit.event.player.PlayerQuitEvent;
  import org.bukkit.event.player.PlayerRespawnEvent;
  import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
  import org.bukkit.util.Vector;
@@ -16,7 +16,7 @@ index 06459ccc..baa08abd 100644
  // CraftBukkit end
  
  public abstract class PlayerList {
-@@ -113,6 +114,19 @@ public abstract class PlayerList {
+@@ -114,6 +115,19 @@ public abstract class PlayerList {
              s1 = networkmanager.getSocketAddress().toString();
          }
  
@@ -34,7 +34,7 @@ index 06459ccc..baa08abd 100644
 +        // Spigot end
 +
          // CraftBukkit - Moved message to after join
-         // PlayerList.f.info("{}[{}] logged in with entity id {} at ({}, {}, {})", entityplayer.getDisplayName().getString(), s1, entityplayer.getId(), entityplayer.locX, entityplayer.locY, entityplayer.locZ);
+         // PlayerList.LOGGER.info("{}[{}] logged in with entity id {} at ({}, {}, {})", entityplayer.getDisplayName().getString(), s1, entityplayer.getId(), entityplayer.locX, entityplayer.locY, entityplayer.locZ);
          WorldData worlddata = worldserver.getWorldData();
 -- 
 2.20.1

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

@@ -1,11 +1,11 @@
-From ff90f4ab80a8866b64f375aec9b4eb94dd5180a5 Mon Sep 17 00:00:00 2001
+From 460a8581447979c700bc0c1146c86326b6e98cee 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 5b2903c6..822d3091 100644
+index d6bbbf6e1..60084c768 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -703,6 +703,12 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -22,7 +22,7 @@ index 5b2903c6..822d3091 100644
  
      public String getServerIp() {
 diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
-index 52b9ddea..7e18291f 100644
+index 52b9ddeae..7e18291f2 100644
 --- a/src/main/java/net/minecraft/server/UserCache.java
 +++ b/src/main/java/net/minecraft/server/UserCache.java
 @@ -131,7 +131,7 @@ public class UserCache {
@@ -44,7 +44,7 @@ index 52b9ddea..7e18291f 100644
      }
  
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index f9a4d224..f990f75a 100644
+index f9a4d2246..f990f75a4 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -325,4 +325,10 @@ public class SpigotConfig

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

@@ -1,11 +1,11 @@
-From 734fd808e9e0cc4f1798fa3815dea8ea61992d46 Mon Sep 17 00:00:00 2001
+From 1bbe0cb0d251dc3b34e51f9d8a76ac64c51ae899 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/PacketPlayInBlockPlace.java b/src/main/java/net/minecraft/server/PacketPlayInBlockPlace.java
-index bb88f7c1..19457650 100644
+index bb88f7c1a..194576502 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayInBlockPlace.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayInBlockPlace.java
 @@ -5,6 +5,7 @@ import java.io.IOException;
@@ -25,7 +25,7 @@ index bb88f7c1..19457650 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PacketPlayInUseItem.java b/src/main/java/net/minecraft/server/PacketPlayInUseItem.java
-index 2f8160ed..5941c3a5 100644
+index 2f8160ed1..5941c3a5e 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayInUseItem.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayInUseItem.java
 @@ -6,11 +6,13 @@ public class PacketPlayInUseItem implements Packet<PacketListenerPlayIn> {
@@ -43,7 +43,7 @@ index 2f8160ed..5941c3a5 100644
          this.a = packetdataserializer.q();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 57a83e02..590f48ba 100644
+index 57a83e02d..590f48ba6 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1215,10 +1215,30 @@ public class PlayerConnection implements PacketListenerPlayIn {

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

@@ -1,11 +1,11 @@
-From f3e383a8e105174cd6adba19bd0c13651d03bc3e Mon Sep 17 00:00:00 2001
+From fc0bbb0447a892fc1bf4fda8abcb1c40984cf771 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
 
 
 diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java
-index bf475303..db2fe836 100644
+index bf475303b..db2fe836c 100644
 --- a/src/main/java/net/minecraft/server/PacketDataSerializer.java
 +++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java
 @@ -247,6 +247,10 @@ public class PacketDataSerializer extends ByteBuf {
@@ -20,7 +20,7 @@ index bf475303..db2fe836 100644
              }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
-index d042ad6e..2053a6c2 100644
+index d042ad6e6..2053a6c2b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 @@ -19,6 +19,10 @@ import org.bukkit.craftbukkit.util.CraftChatMessage;
@@ -58,7 +58,7 @@ index d042ad6e..2053a6c2 100644
          }
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index fa49533c..ac801e4b 100644
+index 57efcb6d1..20301da0b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -76,6 +76,10 @@ import org.bukkit.inventory.meta.ItemMeta;
@@ -101,7 +101,7 @@ index fa49533c..ac801e4b 100644
                      } catch (JsonParseException ex) {
 diff --git a/src/main/java/org/spigotmc/ValidateUtils.java b/src/main/java/org/spigotmc/ValidateUtils.java
 new file mode 100644
-index 00000000..58a95348
+index 000000000..58a953481
 --- /dev/null
 +++ b/src/main/java/org/spigotmc/ValidateUtils.java
 @@ -0,0 +1,14 @@

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

@@ -1,4 +1,4 @@
-From 40e236d9f225288d99577223f35aed67173fbc01 Mon Sep 17 00:00:00 2001
+From ae9f1ab7de1257c5d916e8d09738f84002f07955 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Further Seed Customisation
 Allow server admins that really want to to customise the seeds used in world generation even further.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkGenerator.java b/src/main/java/net/minecraft/server/ChunkGenerator.java
-index cea5166a..4b3a823f 100644
+index cea5166a8..4b3a823fa 100644
 --- a/src/main/java/net/minecraft/server/ChunkGenerator.java
 +++ b/src/main/java/net/minecraft/server/ChunkGenerator.java
 @@ -196,4 +196,10 @@ public abstract class ChunkGenerator<C extends GeneratorSettingsDefault> {
@@ -21,7 +21,7 @@ index cea5166a..4b3a823f 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java
-index 54824842..3140a49e 100644
+index 54824842f..3140a49e1 100644
 --- a/src/main/java/net/minecraft/server/EntitySlime.java
 +++ b/src/main/java/net/minecraft/server/EntitySlime.java
 @@ -276,7 +276,7 @@ public class EntitySlime extends EntityInsentient implements IMonster {
@@ -34,7 +34,7 @@ index 54824842..3140a49e 100644
                  if (this.random.nextInt(10) == 0 && flag && this.locY < 40.0D) {
                      return super.a(generatoraccess, enummobspawn);
 diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureDesertPyramid.java b/src/main/java/net/minecraft/server/WorldGenFeatureDesertPyramid.java
-index 4f1d57b8..c5448463 100644
+index 4f1d57b8a..c54484631 100644
 --- a/src/main/java/net/minecraft/server/WorldGenFeatureDesertPyramid.java
 +++ b/src/main/java/net/minecraft/server/WorldGenFeatureDesertPyramid.java
 @@ -25,8 +25,10 @@ public class WorldGenFeatureDesertPyramid extends WorldGenFeatureRandomScattered
@@ -51,7 +51,7 @@ index 4f1d57b8..c5448463 100644
  
      public static class a extends StructureStart {
 diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureIgloo.java b/src/main/java/net/minecraft/server/WorldGenFeatureIgloo.java
-index 0f6ce152..6f8a9794 100644
+index 0f6ce1526..6f8a97942 100644
 --- a/src/main/java/net/minecraft/server/WorldGenFeatureIgloo.java
 +++ b/src/main/java/net/minecraft/server/WorldGenFeatureIgloo.java
 @@ -25,8 +25,10 @@ public class WorldGenFeatureIgloo extends WorldGenFeatureRandomScattered<WorldGe
@@ -68,7 +68,7 @@ index 0f6ce152..6f8a9794 100644
  
      public static class a extends StructureStart {
 diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureJunglePyramid.java b/src/main/java/net/minecraft/server/WorldGenFeatureJunglePyramid.java
-index 35458425..ca6b1ee8 100644
+index 354584258..ca6b1ee8a 100644
 --- a/src/main/java/net/minecraft/server/WorldGenFeatureJunglePyramid.java
 +++ b/src/main/java/net/minecraft/server/WorldGenFeatureJunglePyramid.java
 @@ -25,8 +25,10 @@ public class WorldGenFeatureJunglePyramid extends WorldGenFeatureRandomScattered
@@ -85,7 +85,7 @@ index 35458425..ca6b1ee8 100644
  
      public static class a extends StructureStart {
 diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuin.java b/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuin.java
-index 5f847e68..7d553ee4 100644
+index 5f847e68f..7d553ee46 100644
 --- a/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuin.java
 +++ b/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuin.java
 @@ -39,8 +39,10 @@ public class WorldGenFeatureOceanRuin extends WorldGenFeatureRandomScattered<Wor
@@ -102,7 +102,7 @@ index 5f847e68..7d553ee4 100644
  
      public static enum Temperature {
 diff --git a/src/main/java/net/minecraft/server/WorldGenFeaturePillagerOutpost.java b/src/main/java/net/minecraft/server/WorldGenFeaturePillagerOutpost.java
-index 9a0dd37e..69b3f404 100644
+index 9a0dd37ea..69b3f404e 100644
 --- a/src/main/java/net/minecraft/server/WorldGenFeaturePillagerOutpost.java
 +++ b/src/main/java/net/minecraft/server/WorldGenFeaturePillagerOutpost.java
 @@ -67,8 +67,10 @@ public class WorldGenFeaturePillagerOutpost extends WorldGenFeatureRandomScatter
@@ -119,7 +119,7 @@ index 9a0dd37e..69b3f404 100644
  
      public static class a extends StructureAbstract {
 diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureRandomScattered.java b/src/main/java/net/minecraft/server/WorldGenFeatureRandomScattered.java
-index ae797325..49ae612b 100644
+index ae7973254..49ae612b1 100644
 --- a/src/main/java/net/minecraft/server/WorldGenFeatureRandomScattered.java
 +++ b/src/main/java/net/minecraft/server/WorldGenFeatureRandomScattered.java
 @@ -21,7 +21,7 @@ public abstract class WorldGenFeatureRandomScattered<C extends WorldGenFeatureCo
@@ -139,7 +139,7 @@ index ae797325..49ae612b 100644
 +    protected abstract int getSeed(World world); // Spigot
  }
 diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureShipwreck.java b/src/main/java/net/minecraft/server/WorldGenFeatureShipwreck.java
-index e89dbbcb..061eb256 100644
+index e89dbbcb7..061eb2569 100644
 --- a/src/main/java/net/minecraft/server/WorldGenFeatureShipwreck.java
 +++ b/src/main/java/net/minecraft/server/WorldGenFeatureShipwreck.java
 @@ -25,8 +25,10 @@ public class WorldGenFeatureShipwreck extends WorldGenFeatureRandomScattered<Wor
@@ -156,7 +156,7 @@ index e89dbbcb..061eb256 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureSwampHut.java b/src/main/java/net/minecraft/server/WorldGenFeatureSwampHut.java
-index a68795c3..e8750d82 100644
+index a68795c30..e8750d827 100644
 --- a/src/main/java/net/minecraft/server/WorldGenFeatureSwampHut.java
 +++ b/src/main/java/net/minecraft/server/WorldGenFeatureSwampHut.java
 @@ -30,8 +30,10 @@ public class WorldGenFeatureSwampHut extends WorldGenFeatureRandomScattered<Worl
@@ -173,7 +173,7 @@ index a68795c3..e8750d82 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/WorldGenMonument.java b/src/main/java/net/minecraft/server/WorldGenMonument.java
-index 2a072e07..053004b8 100644
+index 2a072e07a..053004b8a 100644
 --- a/src/main/java/net/minecraft/server/WorldGenMonument.java
 +++ b/src/main/java/net/minecraft/server/WorldGenMonument.java
 @@ -27,7 +27,7 @@ public class WorldGenMonument extends StructureGenerator<WorldGenFeatureEmptyCon
@@ -186,7 +186,7 @@ index 2a072e07..053004b8 100644
          l2 *= i1;
          k2 += (random.nextInt(i1 - j1) + random.nextInt(i1 - j1)) / 2;
 diff --git a/src/main/java/net/minecraft/server/WorldGenVillage.java b/src/main/java/net/minecraft/server/WorldGenVillage.java
-index ead45107..b155a73a 100644
+index ead451073..b155a73a0 100644
 --- a/src/main/java/net/minecraft/server/WorldGenVillage.java
 +++ b/src/main/java/net/minecraft/server/WorldGenVillage.java
 @@ -21,7 +21,7 @@ public class WorldGenVillage extends StructureGenerator<WorldGenFeatureVillageCo
@@ -199,7 +199,7 @@ index ead45107..b155a73a 100644
          l2 *= i1;
          k2 += random.nextInt(i1 - j1);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index c9380a3f..b4fcf25d 100644
+index c9380a3f1..b4fcf25d4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 @@ -148,7 +148,7 @@ public class CraftChunk implements Chunk {
@@ -212,7 +212,7 @@ index c9380a3f..b4fcf25d 100644
  
      public boolean unload(boolean save) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
-index c9d3f5f4..b474d0bb 100644
+index c9d3f5f41..b474d0bb6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
 +++ b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
 @@ -164,4 +164,10 @@ public class CustomChunkGenerator extends InternalChunkGenerator<GeneratorSettin
@@ -227,7 +227,7 @@ index c9d3f5f4..b474d0bb 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index ee6c4d56..462d0cfe 100644
+index ee6c4d565..462d0cfeb 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -230,4 +230,29 @@ public class SpigotWorldConfig

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

@@ -1,11 +1,11 @@
-From a71de392271da6227701b2b8cf04bca19245d5c6 Mon Sep 17 00:00:00 2001
+From ace18447282882ddfa395bcf19f7fc8929a7cb76 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
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
-index 8ea30312..e9e7d925 100644
+index f965ff64b..97bac7d25 100644
 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
 +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
 @@ -90,7 +90,7 @@ public class WorldNBTStorage implements IPlayerFileData {

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

@@ -1,11 +1,11 @@
-From fd4085a96c13116ce1481be258b2dad86cea5aa6 Mon Sep 17 00:00:00 2001
+From c87cde42f7bca9bdfe37402ce106b98eabe2957a 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
 
 
 diff --git a/src/main/java/net/minecraft/server/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java
-index 20f94507..026ef793 100644
+index cd7d579db..04f98167d 100644
 --- a/src/main/java/net/minecraft/server/JsonList.java
 +++ b/src/main/java/net/minecraft/server/JsonList.java
 @@ -189,6 +189,14 @@ public class JsonList<K, V extends JsonListEntry<K>> {
@@ -24,7 +24,7 @@ index 20f94507..026ef793 100644
                  IOUtils.closeQuietly(bufferedreader);
              }
 diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
-index 7e18291f..f782ecb8 100644
+index 7e18291f2..41be5bf64 100644
 --- a/src/main/java/net/minecraft/server/UserCache.java
 +++ b/src/main/java/net/minecraft/server/UserCache.java
 @@ -207,6 +207,11 @@ public class UserCache {
@@ -33,7 +33,7 @@ index 7e18291f..f782ecb8 100644
              ;
 +        // Spigot Start
 +        } catch (com.google.gson.JsonSyntaxException ex) {
-+            JsonList.a.warn( "Usercache.json is corrupted or has bad formatting. Deleting it to prevent further issues." );
++            JsonList.LOGGER.warn( "Usercache.json is corrupted or has bad formatting. Deleting it to prevent further issues." );
 +            this.h.delete();
 +        // Spigot End
          } catch (JsonParseException jsonparseexception) {

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

@@ -1,4 +1,4 @@
-From 301171e328e8827c7ba17052d387e93277dc8bc6 Mon Sep 17 00:00:00 2001
+From f26ee3be58fb48b1516d424398ea7e70d4aa9aa0 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
@@ -8,7 +8,7 @@ This flag contains the same message as eula.txt (albeit with proper grammar for
 This feature only exists for hosting companies and people who manage servers in bulk who wish to agree to the terms by setting a flag in a script.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 822d3091..09c702ab 100644
+index 60084c768..f4b7752e6 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1118,7 +1118,16 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas

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

@@ -1,4 +1,4 @@
-From 0ec1e2bc3f1c11a9262e0016898ba380ae9c804f Mon Sep 17 00:00:00 2001
+From e79c10d0754b21b4ffe74685ffe034af01dece05 Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Thu, 17 Jul 2014 21:13:15 -0400
 Subject: [PATCH] Fix for enchanting table wiping meta when placing stacked
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix for enchanting table wiping meta when placing stacked
 
 
 diff --git a/src/main/java/net/minecraft/server/ContainerEnchantTable.java b/src/main/java/net/minecraft/server/ContainerEnchantTable.java
-index 53b09eb1..9a8a7963 100644
+index 53b09eb16..9a8a79634 100644
 --- a/src/main/java/net/minecraft/server/ContainerEnchantTable.java
 +++ b/src/main/java/net/minecraft/server/ContainerEnchantTable.java
 @@ -358,7 +358,11 @@ public class ContainerEnchantTable extends Container {

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

@@ -1,11 +1,11 @@
-From fae634a5b0f23a53cac0eb99f0413aef2830e2fe Mon Sep 17 00:00:00 2001
+From 6eedfc08d15b73556c08f293adfb8f22108bc631 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java
-index a9963031..af1ff951 100644
+index a9963031f..af1ff9518 100644
 --- a/src/main/java/net/minecraft/server/EntityOcelot.java
 +++ b/src/main/java/net/minecraft/server/EntityOcelot.java
 @@ -9,6 +9,7 @@ public class EntityOcelot extends EntityAnimal {
@@ -26,7 +26,7 @@ index a9963031..af1ff951 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index cf12b4b5..90b87bb0 100644
+index cf12b4b55..90b87bb01 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1529,6 +1529,12 @@ public class CraftWorld implements World {