Update from upstream SpigotMC

a3168ab2ce4 9b45d9fa8d3 b43a31a5c25 a926b96d5d1 d6b5ba7ca03 bb782d07aed 5a74d55c678 47b1dff3e68 [M]
2024-07-03 02:05:02 +02:00 · 2014-12-18 17:33:08 -06:00 · 2014-12-18 17:33:08 -06:00 · 6a5e553feb
commit 6a5e553feb
parent eb71958f5c
51 changed files with 174 additions and 585 deletions
--- a/Bukkit-Patches/0002-Spigot-Timings.patch
+++ b/Bukkit-Patches/0002-Spigot-Timings.patch
@ -1,4 +1,4 @@
-From ed342265a160060c6a373332c7736dc3f84d4c1f Mon Sep 17 00:00:00 2001
+From 8dae7e33b250ca466847954c03cb5d93d2b6158a 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
@ -98,7 +98,7 @@ index a229d08..a08a49d 100644
         }
 
 diff --git a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
-index 05cfcb0..7907021 100644
+index a39ea5d..552dabb 100644
 --- a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
@@ -19,23 +19,101 @@ import org.bukkit.util.StringUtil;
@ -207,7 +207,7 @@ index 05cfcb0..7907021 100644
         if (!sender.getServer().getPluginManager().useTimings()) {
             sender.sendMessage("Please enable timings by setting \"settings.plugin-profiling\" to true in bukkit.yml");
             return true;
-@@ -118,4 +196,55 @@ public class TimingsCommand extends BukkitCommand {
+@@ -121,4 +199,55 @@ public class TimingsCommand extends BukkitCommand {
         }
         return ImmutableList.of();
     }
--- a/Bukkit-Patches/0006-Add-Particle-API.patch
+++ b/Bukkit-Patches/0006-Add-Particle-API.patch
@ -1,4 +1,4 @@
-From 793c5a6c9904fdaca5d3454d36cc4e21a95b3737 Mon Sep 17 00:00:00 2001
+From ab23377f32ac7a529cd92da2aa25c28af4f675ca Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:57:09 +1000
 Subject: [PATCH] Add Particle API
@ -271,7 +271,7 @@ index 2474a2d..37f29e2 100644
 +    public enum Type {SOUND, VISUAL, PARTICLE}
 }
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index d306201..a909073 100644
+index 828d228..af3d3c4 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -1167,6 +1167,56 @@ public interface World extends PluginMessageRecipient, Metadatable {
@ -329,8 +329,8 @@ index d306201..a909073 100644
 +    // Spigot end
 +
     /**
-      * Represents various map environment types that a world may be
-      */
+      * Gets the world border for this world.
+      *
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
 index 31526a3..0810c68 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
--- a/Bukkit-Patches/0009-InventoryClickEvent-getClickedInventory.patch
+++ b/Bukkit-Patches/0009-InventoryClickEvent-getClickedInventory.patch
@ -1,4 +1,4 @@
-From 2342cce8494165ce97322e3328362db7f5265037 Mon Sep 17 00:00:00 2001
+From a4b8632676d56564379d2c0fba353445c203cdf0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 7 Jul 2013 10:32:05 -0400
 Subject: [PATCH] InventoryClickEvent getClickedInventory
--- a/Bukkit-Patches/0009-Update-Depends.patch
+++ b/Bukkit-Patches/0009-Update-Depends.patch
@ -1,48 +0,0 @@
-From fde5763e08be055830e582208e8c3fd04cf55066 Mon Sep 17 00:00:00 2001
-From: md_5 <md_5@live.com.au>
-Date: Thu, 4 Jul 2013 20:05:19 +1000
-Subject: [PATCH] Update Depends
-
- All of these changes have been reviewed to be binary compatible and in general contract compatible with previous versions of the libraries.
-
-diff --git a/pom.xml b/pom.xml
-index 5048996..17f976d 100644
--- a/pom.xml
-+++ b/pom.xml
-@@ -87,21 +87,21 @@
-         <dependency>
-             <groupId>org.yaml</groupId>
-             <artifactId>snakeyaml</artifactId>
-            <version>1.9</version>
-+            <version>1.12</version>
-             <type>jar</type>
-             <scope>compile</scope>
-         </dependency>
-         <dependency>
-             <groupId>com.googlecode.json-simple</groupId>
-             <artifactId>json-simple</artifactId>
-            <version>1.1</version>
-+            <version>1.1.1</version>
-             <type>jar</type>
-             <scope>compile</scope>
-         </dependency>
-         <dependency>
-             <groupId>org.avaje</groupId>
-             <artifactId>ebean</artifactId>
-            <version>2.7.3</version>
-+            <version>2.8.1</version>
-             <type>jar</type>
-             <scope>compile</scope>
-         </dependency>
-@@ -116,7 +116,7 @@
-         <dependency>
-             <groupId>commons-lang</groupId>
-             <artifactId>commons-lang</artifactId>
-            <version>2.3</version>
-+            <version>2.6</version>
-         </dependency>
- 
-         <!-- testing -->
-- 
-2.1.0
-
--- a/Bukkit-Patches/0010-Added-getAllSessionData-to-the-Conversation-API.patch
+++ b/Bukkit-Patches/0010-Added-getAllSessionData-to-the-Conversation-API.patch
@ -1,4 +1,4 @@
-From 1ea7e8ad9ead0d6cd126387608c0543244b68a3d Mon Sep 17 00:00:00 2001
+From 9259c4a3c94e32c00f8caf68c3efcdcd75e2e962 Mon Sep 17 00:00:00 2001
 From: Alex Bennett <alex.eugene.bennett@gmail.com>
 Date: Thu, 11 Jul 2013 15:31:32 -0500
 Subject: [PATCH] Added getAllSessionData() to the Conversation API.
--- a/Bukkit-Patches/0011-Catch-Conversation-API-Errors.patch
+++ b/Bukkit-Patches/0011-Catch-Conversation-API-Errors.patch
@ -1,4 +1,4 @@
-From bd775c3569e6cd82d7100a37d2f3c697fe879ab9 Mon Sep 17 00:00:00 2001
+From 2bf63e41d6854c72b75337ce059dbecf5753cffc Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Mon, 22 Jul 2013 19:09:43 +1000
 Subject: [PATCH] Catch Conversation API Errors
--- a/Bukkit-Patches/0012-Player-Collision-API.patch
+++ b/Bukkit-Patches/0012-Player-Collision-API.patch
@ -1,4 +1,4 @@
-From e76c98d100815eea690734eb3d0e4fa766f51000 Mon Sep 17 00:00:00 2001
+From 4ffcac79bafd79cfb57534b7b663f1a027a6165a 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
--- a/Bukkit-Patches/0013-Expand-Boolean-Prompt-Values.patch
+++ b/Bukkit-Patches/0013-Expand-Boolean-Prompt-Values.patch
@ -1,4 +1,4 @@
-From 9f076ca35e20c23c3b897af47c987ed09915d116 Mon Sep 17 00:00:00 2001
+From e4e404f5b4be5017b2ded1163d757defc333f510 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 3 Aug 2013 19:42:16 +1000
 Subject: [PATCH] Expand Boolean Prompt Values
--- a/Bukkit-Patches/0014-Add-Getter-for-Entity-Invulnerability.patch
+++ b/Bukkit-Patches/0014-Add-Getter-for-Entity-Invulnerability.patch
@ -1,4 +1,4 @@
-From bacd16b4a31a5c592198e722a4840d375e414ab3 Mon Sep 17 00:00:00 2001
+From 1457047cefccb7d5c22336646d125a5a52b3b0ea 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
--- a/Bukkit-Patches/0015-Add-respawn-API.patch
+++ b/Bukkit-Patches/0015-Add-respawn-API.patch
@ -1,4 +1,4 @@
-From 2de6d85f734c7d63698348a23dcb1bf574882eb4 Mon Sep 17 00:00:00 2001
+From 2d32c210aafd72c3a012559de91f3d4947281d56 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.
--- a/Bukkit-Patches/0016-Fix-Plugin-Message-API-Disconnects.patch
+++ b/Bukkit-Patches/0016-Fix-Plugin-Message-API-Disconnects.patch
@ -1,4 +1,4 @@
-From 12b7c52f44eefe1abc525c1075c83fca7e66107a Mon Sep 17 00:00:00 2001
+From 769126463b7a3a296239b1109f4ce289125530f0 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 19 Oct 2013 12:59:42 +1100
 Subject: [PATCH] Fix Plugin Message API Disconnects
--- a/Bukkit-Patches/0017-Fix-Tab-Completion-for-Some-Commands.patch
+++ b/Bukkit-Patches/0017-Fix-Tab-Completion-for-Some-Commands.patch
@ -1,4 +1,4 @@
-From ae4065bed1e879011f318af1bba1c8cdfaa7951c Mon Sep 17 00:00:00 2001
+From 8ec7365aa7fe168085927df79de3ed5edce1ff51 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 24 Dec 2013 10:14:25 +1100
 Subject: [PATCH] Fix Tab Completion for Some Commands
--- a/Bukkit-Patches/0018-Implement-Locale-Getter-for-Players.patch
+++ b/Bukkit-Patches/0018-Implement-Locale-Getter-for-Players.patch
@ -1,4 +1,4 @@
-From 382384ef968b8eaef01afb523caa0d2c054f8e36 Mon Sep 17 00:00:00 2001
+From 04b1682876ab927fcfd4d937131bb117f943f668 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
--- a/Bukkit-Patches/0019-Add-Spigot-Links.patch
+++ b/Bukkit-Patches/0019-Add-Spigot-Links.patch
@ -1,29 +0,0 @@
-From f3747d42f64987b41461b524c51ab17e19749ef9 Mon Sep 17 00:00:00 2001
-From: md_5 <git@md-5.net>
-Date: Thu, 23 Jan 2014 13:17:38 +1100
-Subject: [PATCH] Add Spigot Links
-
-
-diff --git a/README.md b/README.md
-index a51766e..1905b8d 100644
--- a/README.md
-+++ b/README.md
-@@ -1,11 +1,11 @@
-Bukkit
-+Spigot-API
- ======
- 
- A Minecraft Server API.
- 
-Website: [http://bukkit.org](http://bukkit.org)  
-Bugs/Suggestions: [http://leaky.bukkit.org](http://leaky.bukkit.org)  
-Contributing Guidelines: [CONTRIBUTING.md](https://github.com/Bukkit/Bukkit/blob/master/CONTRIBUTING.md)
-+Website: [http://spigotmc.org](http://spigotmc.org)  
-+Bugs/Suggestions: [http://www.spigotmc.org/forums/bugs-feature-requests.8/](http://www.spigotmc.org/forums/bugs-feature-requests.8/)  
-+Contributing Guidelines: [CONTRIBUTING.md](https://github.com/SpigotMC/Spigot-API/blob/master/CONTRIBUTING.md)
- 
- Compilation
- -----------
-- 
-2.1.0
-
--- a/Bukkit-Patches/0019-Add-support-for-fetching-hidden-players.patch
+++ b/Bukkit-Patches/0019-Add-support-for-fetching-hidden-players.patch
@ -1,4 +1,4 @@
-From 2185fb3d84d8548c4a880e86e8686d8dfcb8fed6 Mon Sep 17 00:00:00 2001
+From d586570d9c65c5e4098a7e56093c5f9d1906448d 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
--- a/Bukkit-Patches/0020-Silenceable-Lightning-API.patch
+++ b/Bukkit-Patches/0020-Silenceable-Lightning-API.patch
@ -1,11 +1,11 @@
-From 068c3416cfb2542f94308893bfe6932f01870acb Mon Sep 17 00:00:00 2001
+From f88bbe8cf5ddc7505533b820c6736ae9945e388c 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


 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index a909073..fd399d3 100644
+index af3d3c4..1688943 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
@@ -1212,6 +1212,30 @@ public interface World extends PluginMessageRecipient, Metadatable {
--- a/Bukkit-Patches/0021-Remove-deprecation-on-some-player-lookup-methods.patch
+++ b/Bukkit-Patches/0021-Remove-deprecation-on-some-player-lookup-methods.patch
@ -1,4 +1,4 @@
-From 3a749aa1121dff4ead2d7eed05e89f15bb76c5ab Mon Sep 17 00:00:00 2001
+From 8ddc48cbd6e16fb763151c085632f0244dc06720 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
--- a/Bukkit-Patches/0022-Expand-team-API-to-allow-arbitrary-strings.patch
+++ b/Bukkit-Patches/0022-Expand-team-API-to-allow-arbitrary-strings.patch
@ -1,14 +1,14 @@
-From 36b136881620915be2a5eb039c3a9b8c1dc0861b Mon Sep 17 00:00:00 2001
+From b23657a0a81d18e8c99c670229fbd32012f0629d Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Thu, 17 Apr 2014 19:22:26 +1000
 Subject: [PATCH] Expand team API to allow arbitrary strings.


 diff --git a/src/main/java/org/bukkit/scoreboard/Team.java b/src/main/java/org/bukkit/scoreboard/Team.java
-index 50c6f76..b90b9c3 100644
+index e6d1442..2bd78e3 100644
 --- a/src/main/java/org/bukkit/scoreboard/Team.java
 +++ b/src/main/java/org/bukkit/scoreboard/Team.java
-@@ -118,6 +118,15 @@ public interface Team {
+@@ -134,6 +134,15 @@ public interface Team {
      */
     Set<OfflinePlayer> getPlayers() throws IllegalStateException;
 
@ -24,7 +24,7 @@ index 50c6f76..b90b9c3 100644
     /**
      * Gets the size of the team
      *
-@@ -145,6 +154,15 @@ public interface Team {
+@@ -161,6 +170,15 @@ public interface Team {
      */
     void addPlayer(OfflinePlayer player) throws IllegalStateException, IllegalArgumentException;
 
@ -40,7 +40,7 @@ index 50c6f76..b90b9c3 100644
     /**
      * Removes the player from this team.
      *
-@@ -155,6 +173,15 @@ public interface Team {
+@@ -171,6 +189,15 @@ public interface Team {
      */
     boolean removePlayer(OfflinePlayer player) throws IllegalStateException, IllegalArgumentException;
 
@ -56,7 +56,7 @@ index 50c6f76..b90b9c3 100644
     /**
      * Unregisters this team from the Scoreboard
      *
-@@ -171,4 +198,13 @@ public interface Team {
+@@ -187,4 +214,13 @@ public interface Team {
      * @throws IllegalStateException if this team has been unregistered
      */
     boolean hasPlayer(OfflinePlayer player) throws IllegalArgumentException, IllegalStateException;
--- a/Bukkit-Patches/0023-Add-Score.isScoreSet-Z-API.patch
+++ b/Bukkit-Patches/0023-Add-Score.isScoreSet-Z-API.patch
@ -1,4 +1,4 @@
-From 396a8869eb8e9de9089637b76a71234c02d1fdf2 Mon Sep 17 00:00:00 2001
+From 57096a321a825746d57c6086f6fe6e58d7c47b2b Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Thu, 17 Apr 2014 19:35:13 +1000
 Subject: [PATCH] Add Score.isScoreSet()Z API.
--- a/Bukkit-Patches/0024-Add-PlayerSpawnLocationEvent.patch
+++ b/Bukkit-Patches/0024-Add-PlayerSpawnLocationEvent.patch
@ -1,4 +1,4 @@
-From c3183b435807fa97baad65b698066e9a15a2ae47 Mon Sep 17 00:00:00 2001
+From 361c10f6aa8091bbc049d234da6943a7e714a3f5 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.
--- a/Bukkit-Patches/0025-Ease-ClassLoader-Deadlocks-Where-Possible.patch
+++ b/Bukkit-Patches/0025-Ease-ClassLoader-Deadlocks-Where-Possible.patch
@ -1,4 +1,4 @@
-From 7b22f91f252d08fdad9c53a669f51356fb34db71 Mon Sep 17 00:00:00 2001
+From a6422025ca106765cdb65850b95312bfd09d715f Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 16 Jul 2014 17:24:21 +1000
 Subject: [PATCH] Ease ClassLoader Deadlocks Where Possible
--- a/Bukkit-Patches/0026-Fix-slow-tab-complete-for-some-commands.patch
+++ b/Bukkit-Patches/0026-Fix-slow-tab-complete-for-some-commands.patch
@ -1,4 +1,4 @@
-From 69caadfa860617c30596bae5eefc58b7bd1a558e Mon Sep 17 00:00:00 2001
+From 1a959c79f570df505027e28a1178174b921bf329 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 22 Jul 2014 21:01:32 +1000
 Subject: [PATCH] Fix slow tab complete for some commands.
--- a/Bukkit-Patches/0027-Undeprecate-Player-updateInventory-V.patch
+++ b/Bukkit-Patches/0027-Undeprecate-Player-updateInventory-V.patch
@ -1,4 +1,4 @@
-From f8e416af1d4903c5086910c7325987dfaac2d619 Mon Sep 17 00:00:00 2001
+From 3b4772976f00c3fa8a6991af9556595b0d0e75ca 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
--- a/Bukkit-Patches/0028-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch
+++ b/Bukkit-Patches/0028-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch
@ -1,4 +1,4 @@
-From 203a3470d214613a5d1f979290dfc71c308f9596 Mon Sep 17 00:00:00 2001
+From 4cc32e6b5ba0ce443602fc5d436707053c98652b 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
--- a/Bukkit-Patches/0029-BungeeCord-Chat-API.patch
+++ b/Bukkit-Patches/0029-BungeeCord-Chat-API.patch
@ -1,11 +1,11 @@
-From b7b8fcaa806f8debf854aa025282d39936d0f357 Mon Sep 17 00:00:00 2001
+From 585d45507846245f38fcbd96c50d7d090ae04cd6 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 13 Dec 2014 12:59:14 +1100
 Subject: [PATCH] BungeeCord Chat API


 diff --git a/pom.xml b/pom.xml
-index 17f976d..674920b 100644
+index 7073202..89c1ade 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -118,6 +118,13 @@
@ -81,5 +81,5 @@ index b55d70e..8eb781e 100644
 
     Spigot spigot();
 -- 
-2.1.0
+1.9.4.msysgit.2

--- a/CraftBukkit-Patches/0001-POM-Changes.patch
+++ b/CraftBukkit-Patches/0001-POM-Changes.patch
@ -1,4 +1,4 @@
-From aa9d90078891dc1465e5dcb8de265793a377419e Mon Sep 17 00:00:00 2001
+From 84cceb2127d9feeb2dbc3a7706be0ae5d58f7b64 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,7 +6,7 @@ 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 49f8028..4e6f620 100644
+index 2b29172..dc1d420 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -1,12 +1,12 @@
@ -26,7 +26,7 @@ index 49f8028..4e6f620 100644
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-@@ -18,6 +18,13 @@
+@@ -18,10 +18,17 @@
     <buildtag.suffix></buildtag.suffix>
   </properties>
 
@ -37,11 +37,6 @@ index 49f8028..4e6f620 100644
 +    <relativePath>../pom.xml</relativePath>
 +  </parent>
 +
-   <repositories>
-     <repository>
-       <id>repobo-snap</id>
-@@ -34,8 +41,8 @@
- 
   <dependencies>
     <dependency>
 -      <groupId>org.bukkit</groupId>
@ -51,7 +46,7 @@ index 49f8028..4e6f620 100644
       <version>${project.version}</version>
       <type>jar</type>
       <scope>compile</scope>
-@@ -124,21 +131,39 @@
+@@ -83,21 +90,39 @@
 
   <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
   <build>
@ -94,7 +89,7 @@ index 49f8028..4e6f620 100644
             <phase>compile</phase>
             <goals>
               <goal>gitdescribe</goal>
-@@ -155,7 +180,7 @@
+@@ -114,7 +139,7 @@
             <manifestEntries>
               <Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
               <Implementation-Title>CraftBukkit</Implementation-Title>
@ -103,7 +98,7 @@ index 49f8028..4e6f620 100644
               <Implementation-Vendor>Bukkit Team</Implementation-Vendor>
               <Specification-Title>Bukkit</Specification-Title>
               <Specification-Version>${api.version}</Specification-Version>
-@@ -188,7 +213,7 @@
+@@ -147,7 +172,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
@ -126,5 +121,5 @@ index f905d17..9304637 100644
 
         if (stream != null) {
 -- 
-2.1.0
+1.9.4.msysgit.2

--- a/CraftBukkit-Patches/0002-mc-dev-imports.patch
+++ b/CraftBukkit-Patches/0002-mc-dev-imports.patch
@ -1,4 +1,4 @@
-From 5d54186471e9e6ed231545bf77a35e765e31f8d0 Mon Sep 17 00:00:00 2001
+From f6f591757131a3e3508938c25af98cda07aba2ff 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
@ -140,344 +140,6 @@ index 0000000..b1c6ad3
 +        this(usercache);
 +    }
 +}
-diff --git a/src/main/java/net/minecraft/server/BiomeDecorator.java b/src/main/java/net/minecraft/server/BiomeDecorator.java
-deleted file mode 100644
-index e216a0c..0000000
--- a/src/main/java/net/minecraft/server/BiomeDecorator.java
-+++ /dev/null
-@@ -1,332 +0,0 @@
-package net.minecraft.server;
-
-import java.util.Random;
-
-public class BiomeDecorator {
-
-    protected World a;
-    protected Random b;
-    protected BlockPosition c;
-    protected CustomWorldSettingsFinal d;
-    protected WorldGenerator e = new WorldGenClay(4);
-    protected WorldGenerator f;
-    protected WorldGenerator g;
-    protected WorldGenerator h;
-    protected WorldGenerator i;
-    protected WorldGenerator j;
-    protected WorldGenerator k;
-    protected WorldGenerator l;
-    protected WorldGenerator m;
-    protected WorldGenerator n;
-    protected WorldGenerator o;
-    protected WorldGenerator p;
-    protected WorldGenerator q;
-    protected WorldGenerator r;
-    protected WorldGenFlowers s;
-    protected WorldGenerator t;
-    protected WorldGenerator u;
-    protected WorldGenerator v;
-    protected WorldGenerator w;
-    protected WorldGenerator x;
-    protected WorldGenerator y;
-    protected int z;
-    protected int A;
-    protected int B;
-    protected int C;
-    protected int D;
-    protected int E;
-    protected int F;
-    protected int G;
-    protected int H;
-    protected int I;
-    protected int J;
-    protected int K;
-    public boolean L;
-
-    public BiomeDecorator() {
-        this.f = new WorldGenSand(Blocks.SAND, 7);
-        this.g = new WorldGenSand(Blocks.GRAVEL, 6);
-        this.s = new WorldGenFlowers(Blocks.YELLOW_FLOWER, EnumFlowerVarient.DANDELION);
-        this.t = new WorldGenMushrooms(Blocks.BROWN_MUSHROOM);
-        this.u = new WorldGenMushrooms(Blocks.RED_MUSHROOM);
-        this.v = new WorldGenHugeMushroom();
-        this.w = new WorldGenReed();
-        this.x = new WorldGenCactus();
-        this.y = new WorldGenWaterLily();
-        this.B = 2;
-        this.C = 1;
-        this.H = 1;
-        this.I = 3;
-        this.J = 1;
-        this.L = true;
-    }
-
-    public void a(World world, Random random, BiomeBase biomebase, BlockPosition blockposition) {
-        if (this.a != null) {
-            throw new RuntimeException("Already decorating");
-        } else {
-            this.a = world;
-            String s = world.getWorldData().getGeneratorOptions();
-
-            if (s != null) {
-                this.d = CustomWorldSettings.a(s).b();
-            } else {
-                this.d = CustomWorldSettings.a("").b();
-            }
-
-            this.b = random;
-            this.c = blockposition;
-            this.h = new WorldGenMinable(Blocks.DIRT.getBlockData(), this.d.I);
-            this.i = new WorldGenMinable(Blocks.GRAVEL.getBlockData(), this.d.M);
-            this.j = new WorldGenMinable(Blocks.STONE.getBlockData().set(BlockStone.VARIANT, EnumStoneVariant.GRANITE), this.d.Q);
-            this.k = new WorldGenMinable(Blocks.STONE.getBlockData().set(BlockStone.VARIANT, EnumStoneVariant.DIORITE), this.d.U);
-            this.l = new WorldGenMinable(Blocks.STONE.getBlockData().set(BlockStone.VARIANT, EnumStoneVariant.ANDESITE), this.d.Y);
-            this.m = new WorldGenMinable(Blocks.COAL_ORE.getBlockData(), this.d.ac);
-            this.n = new WorldGenMinable(Blocks.IRON_ORE.getBlockData(), this.d.ag);
-            this.o = new WorldGenMinable(Blocks.GOLD_ORE.getBlockData(), this.d.ak);
-            this.p = new WorldGenMinable(Blocks.REDSTONE_ORE.getBlockData(), this.d.ao);
-            this.q = new WorldGenMinable(Blocks.DIAMOND_ORE.getBlockData(), this.d.as);
-            this.r = new WorldGenMinable(Blocks.LAPIS_ORE.getBlockData(), this.d.aw);
-            this.a(biomebase);
-            this.a = null;
-            this.b = null;
-        }
-    }
-
-    protected void a(BiomeBase biomebase) {
-        this.a();
-
-        int i;
-        int j;
-        int k;
-
-        for (i = 0; i < this.I; ++i) {
-            j = this.b.nextInt(16) + 8;
-            k = this.b.nextInt(16) + 8;
-            this.f.generate(this.a, this.b, this.a.r(this.c.a(j, 0, k)));
-        }
-
-        for (i = 0; i < this.J; ++i) {
-            j = this.b.nextInt(16) + 8;
-            k = this.b.nextInt(16) + 8;
-            this.e.generate(this.a, this.b, this.a.r(this.c.a(j, 0, k)));
-        }
-
-        for (i = 0; i < this.H; ++i) {
-            j = this.b.nextInt(16) + 8;
-            k = this.b.nextInt(16) + 8;
-            this.g.generate(this.a, this.b, this.a.r(this.c.a(j, 0, k)));
-        }
-
-        i = this.A;
-        if (this.b.nextInt(10) == 0) {
-            ++i;
-        }
-
-        int l;
-        BlockPosition blockposition;
-
-        for (j = 0; j < i; ++j) {
-            k = this.b.nextInt(16) + 8;
-            l = this.b.nextInt(16) + 8;
-            WorldGenTreeAbstract worldgentreeabstract = biomebase.a(this.b);
-
-            worldgentreeabstract.e();
-            blockposition = this.getHighestBlockYAt(this.c.a(k, 0, l)); // CraftBukkit - Prevent crash
-            if (worldgentreeabstract.generate(this.a, this.b, blockposition)) {
-                worldgentreeabstract.a(this.a, this.b, blockposition);
-            }
-        }
-
-        for (j = 0; j < this.K; ++j) {
-            k = this.b.nextInt(16) + 8;
-            l = this.b.nextInt(16) + 8;
-            this.v.generate(this.a, this.b, this.getHighestBlockYAt(this.c.a(k, 0, l ))); // CraftBukkit - Prevent crash
-        }
-
-        int i1;
-
-        for (j = 0; j < this.B; ++j) {
-            k = this.b.nextInt(16) + 8;
-            l = this.b.nextInt(16) + 8;
-            i1 = this.b.nextInt(this.getHighestBlockYAt(this.c.a(k, 0, l)).getY() + 32); // CraftBukkit - Prevent crash
-            blockposition = this.c.a(k, i1, l);
-            EnumFlowerVarient enumflowervarient = biomebase.a(this.b, blockposition);
-            BlockFlowers blockflowers = enumflowervarient.a().a();
-
-            if (blockflowers.getMaterial() != Material.AIR) {
-                this.s.a(blockflowers, enumflowervarient);
-                this.s.generate(this.a, this.b, blockposition);
-            }
-        }
-
-        for (j = 0; j < this.C; ++j) {
-            k = this.b.nextInt(16) + 8;
-            l = this.b.nextInt(16) + 8;
-            i1 = this.b.nextInt(this.getHighestBlockYAt(this.c.a(k, 0, l)).getY() * 2); // CraftBukkit - Prevent crash
-            biomebase.b(this.b).generate(this.a, this.b, this.c.a(k, i1, l));
-        }
-
-        for (j = 0; j < this.D; ++j) {
-            k = this.b.nextInt(16) + 8;
-            l = this.b.nextInt(16) + 8;
-            i1 = this.b.nextInt(this.getHighestBlockYAt(this.c.a(k, 0, l)).getY() * 2); // CraftBukkit - Prevent crash
-            (new WorldGenDeadBush()).generate(this.a, this.b, this.c.a(k, i1, l));
-        }
-
-        j = 0;
-
-        while (j < this.z) {
-            k = this.b.nextInt(16) + 8;
-            l = this.b.nextInt(16) + 8;
-            i1 = this.b.nextInt(this.getHighestBlockYAt(this.c.a(k, 0, l)).getY() * 2); // CraftBukkit - Prevent crash
-            blockposition = this.c.a(k, i1, l);
-
-            while (true) {
-                if (blockposition.getY() > 0) {
-                    BlockPosition blockposition1 = blockposition.down();
-
-                    if (this.a.isEmpty(blockposition1)) {
-                        blockposition = blockposition1;
-                        continue;
-                    }
-                }
-
-                this.y.generate(this.a, this.b, blockposition);
-                ++j;
-                break;
-            }
-        }
-
-        for (j = 0; j < this.E; ++j) {
-            if (this.b.nextInt(4) == 0) {
-                k = this.b.nextInt(16) + 8;
-                l = this.b.nextInt(16) + 8;
-                BlockPosition blockposition2 = this.getHighestBlockYAt(this.c.a(k, 0, l)); // CraftBukkit - Prevent crash
-
-                this.t.generate(this.a, this.b, blockposition2);
-            }
-
-            if (this.b.nextInt(8) == 0) {
-                k = this.b.nextInt(16) + 8;
-                l = this.b.nextInt(16) + 8;
-                i1 = this.b.nextInt(this.getHighestBlockYAt(this.c.a(k, 0, l)).getY() * 2); // CraftBukkit - Prevent crash
-                blockposition = this.c.a(k, i1, l);
-                this.u.generate(this.a, this.b, blockposition);
-            }
-        }
-
-        if (this.b.nextInt(4) == 0) {
-            j = this.b.nextInt(16) + 8;
-            k = this.b.nextInt(16) + 8;
-            l = this.b.nextInt(this.getHighestBlockYAt(this.c.a(j, 0, k)).getY() * 2); // CraftBukkit - Prevent crash
-            this.t.generate(this.a, this.b, this.c.a(j, l, k));
-        }
-
-        if (this.b.nextInt(8) == 0) {
-            j = this.b.nextInt(16) + 8;
-            k = this.b.nextInt(16) + 8;
-            l = this.b.nextInt(this.getHighestBlockYAt(this.c.a(j, 0, k)).getY() * 2); // CraftBukkit - Prevent crash
-            this.u.generate(this.a, this.b, this.c.a(j, l, k));
-        }
-
-        for (j = 0; j < this.F; ++j) {
-            k = this.b.nextInt(16) + 8;
-            l = this.b.nextInt(16) + 8;
-            i1 = this.b.nextInt(this.getHighestBlockYAt(this.c.a(k, 0, l)).getY() * 2); // CraftBukkit - Prevent crash
-            this.w.generate(this.a, this.b, this.c.a(k, i1, l));
-        }
-
-        for (j = 0; j < 10; ++j) {
-            k = this.b.nextInt(16) + 8;
-            l = this.b.nextInt(16) + 8;
-            i1 = this.b.nextInt(this.getHighestBlockYAt(this.c.a(k, 0, l)).getY() * 2); // CraftBukkit - Prevent crash
-            this.w.generate(this.a, this.b, this.c.a(k, i1, l));
-        }
-
-        if (this.b.nextInt(32) == 0) {
-            j = this.b.nextInt(16) + 8;
-            k = this.b.nextInt(16) + 8;
-            l = this.b.nextInt(this.getHighestBlockYAt(this.c.a(j, 0, k)).getY() * 2); // CraftBukkit - Prevent crash
-            (new WorldGenPumpkin()).generate(this.a, this.b, this.c.a(j, l, k));
-        }
-
-        for (j = 0; j < this.G; ++j) {
-            k = this.b.nextInt(16) + 8;
-            l = this.b.nextInt(16) + 8;
-            i1 = this.b.nextInt(this.getHighestBlockYAt(this.c.a(k, 0, l)).getY() * 2); // CraftBukkit - Prevent crash
-            this.x.generate(this.a, this.b, this.c.a(k, i1, l));
-        }
-
-        if (this.L) {
-            BlockPosition blockposition3;
-
-            for (j = 0; j < 50; ++j) {
-                blockposition3 = this.c.a(this.b.nextInt(16) + 8, this.b.nextInt(this.b.nextInt(248) + 8), this.b.nextInt(16) + 8);
-                (new WorldGenLiquids(Blocks.FLOWING_WATER)).generate(this.a, this.b, blockposition3);
-            }
-
-            for (j = 0; j < 20; ++j) {
-                blockposition3 = this.c.a(this.b.nextInt(16) + 8, this.b.nextInt(this.b.nextInt(this.b.nextInt(240) + 8) + 8), this.b.nextInt(16) + 8);
-                (new WorldGenLiquids(Blocks.FLOWING_LAVA)).generate(this.a, this.b, blockposition3);
-            }
-        }
-
-    }
-
-    // CraftBukkit start - The heightMap can be wrong calculated and return Y = 0 which will crash the Server
-    private BlockPosition getHighestBlockYAt( BlockPosition blockPosition ) {
-        BlockPosition returnBlockPosition = this.a.getHighestBlockYAt( blockPosition );
-        if ( returnBlockPosition.getY() == 0 ) {
-            returnBlockPosition = returnBlockPosition.up( 1 );
-        }
-        return returnBlockPosition;
-    }
-    // CraftBukkit end
-
-    protected void a(int i, WorldGenerator worldgenerator, int j, int k) {
-        int l;
-
-        if (k < j) {
-            l = j;
-            j = k;
-            k = l;
-        } else if (k == j) {
-            if (j < 255) {
-                ++k;
-            } else {
-                --j;
-            }
-        }
-
-        for (l = 0; l < i; ++l) {
-            BlockPosition blockposition = this.c.a(this.b.nextInt(16), this.b.nextInt(k - j) + j, this.b.nextInt(16));
-
-            worldgenerator.generate(this.a, this.b, blockposition);
-        }
-
-    }
-
-    protected void b(int i, WorldGenerator worldgenerator, int j, int k) {
-        for (int l = 0; l < i; ++l) {
-            BlockPosition blockposition = this.c.a(this.b.nextInt(16), this.b.nextInt(k) + this.b.nextInt(k) + j - k, this.b.nextInt(16));
-
-            worldgenerator.generate(this.a, this.b, blockposition);
-        }
-
-    }
-
-    protected void a() {
-        this.a(this.d.J, this.h, this.d.K, this.d.L);
-        this.a(this.d.N, this.i, this.d.O, this.d.P);
-        this.a(this.d.V, this.k, this.d.W, this.d.X);
-        this.a(this.d.R, this.j, this.d.S, this.d.T);
-        this.a(this.d.Z, this.l, this.d.aa, this.d.ab);
-        this.a(this.d.ad, this.m, this.d.ae, this.d.af);
-        this.a(this.d.ah, this.n, this.d.ai, this.d.aj);
-        this.a(this.d.al, this.o, this.d.am, this.d.an);
-        this.a(this.d.ap, this.p, this.d.aq, this.d.ar);
-        this.a(this.d.at, this.q, this.d.au, this.d.av);
-        this.b(this.d.ax, this.r, this.d.ay, this.d.az);
-    }
-}
 diff --git a/src/main/java/net/minecraft/server/BlockAnvil.java b/src/main/java/net/minecraft/server/BlockAnvil.java
 new file mode 100644
 index 0000000..8c9ed4c
--- a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
+++ b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
@ -1,4 +1,4 @@
-From 49a8359446f3929a0b2ac0de40c59502ddad5a58 Mon Sep 17 00:00:00 2001
+From 0f2279c57a405dc675881ee5941edd85de9bb30f 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
@ -25,10 +25,10 @@ index b4ad7d1..4c33f5a 100644
 +    }
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index a7d3e5f..1353c90 100644
+index 4ff9c1a..486a828 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1309,4 +1309,14 @@ public class CraftWorld implements World {
+@@ -1347,4 +1347,14 @@ public class CraftWorld implements World {
             cps.queueUnload(chunk.locX, chunk.locZ);
         }
     }
@ -104,10 +104,10 @@ index 64e346d..243e8e5 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 3b9bfec..e4d0e41 100644
+index 6361b44..fed7b4d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1310,4 +1310,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1313,4 +1313,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
         }
         collection.add(new AttributeModifiable(getHandle().getAttributeMap(), (new AttributeRanged(null, "generic.maxHealth", scaledHealth ? healthScale : getMaxHealth(), 0.0D, Float.MAX_VALUE)).a("Max Health").a(true)));
     }
@ -124,12 +124,12 @@ index 3b9bfec..e4d0e41 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 78a0ab4..fabaecf 100644
+index 7ebb70b..e80fce2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -668,4 +668,16 @@ class CraftMetaItem implements ItemMeta, Repairable {
-     public final String toString() {
-         return SerializableMeta.classMap.get(getClass()) + "_META:" + serialize(); // TODO: cry
+@@ -713,4 +713,16 @@ class CraftMetaItem implements ItemMeta, Repairable {
+         }
+         return HANDLED_TAGS;
     }
 +
 +    // Spigot start
@ -161,12 +161,12 @@ index 7095f6d..c7d3657 100644
 +    // Spigot end
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
-index 8a640d3..e38d109 100644
+index e8d1c08..ecbf66b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
-@@ -142,4 +142,26 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
-         scoreboard.teams.remove(team.getName());
-         setUnregistered();
+@@ -188,4 +188,26 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
+                 throw new IllegalArgumentException("Unknown visibility level " + visibility);
+         }
     }
 +
 +    // Spigot start
--- a/CraftBukkit-Patches/0010-Async-Operation-Catching.patch
+++ b/CraftBukkit-Patches/0010-Async-Operation-Catching.patch
@ -1,4 +1,4 @@
-From 76495911ffd8d39b010a3949dd94079ff66c77a6 Mon Sep 17 00:00:00 2001
+From 06a697947e18bc5bdfbe8a498d9ab320ae69bf13 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
@ -94,10 +94,10 @@ index 57aba85..3982d53 100644
         // this.entityList.addAll(collection);
         Iterator iterator = collection.iterator();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 8d28b9a..80f84a8 100644
+index 486a828..a9ff641 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -162,6 +162,7 @@ public class CraftWorld implements World {
+@@ -165,6 +165,7 @@ public class CraftWorld implements World {
     }
 
     public boolean unloadChunkRequest(int x, int z, boolean safe) {
@ -105,7 +105,7 @@ index 8d28b9a..80f84a8 100644
         if (safe && isChunkInUse(x, z)) {
             return false;
         }
-@@ -172,6 +173,7 @@ public class CraftWorld implements World {
+@@ -175,6 +176,7 @@ public class CraftWorld implements World {
     }
 
     public boolean unloadChunk(int x, int z, boolean save, boolean safe) {
@ -113,7 +113,7 @@ index 8d28b9a..80f84a8 100644
         if (safe && isChunkInUse(x, z)) {
             return false;
         }
-@@ -239,6 +241,7 @@ public class CraftWorld implements World {
+@@ -242,6 +244,7 @@ public class CraftWorld implements World {
     }
 
     public boolean loadChunk(int x, int z, boolean generate) {
--- a/CraftBukkit-Patches/0012-Spigot-Timings.patch
+++ b/CraftBukkit-Patches/0012-Spigot-Timings.patch
@ -1,4 +1,4 @@
-From 0bd6f84fab9a64e161181f3d32009bbbd71aac3a Mon Sep 17 00:00:00 2001
+From d068a03aa38d6ce011d7694e297ecd2a09c9a529 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
@ -367,7 +367,7 @@ index 5e53661..49429d7 100644
         this.methodProfiler.b();
     }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 38ca035..d3530c9 100644
+index ba20917..7863f9b 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1042,6 +1042,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
@ -600,10 +600,10 @@ index 51e4489..5286c1e 100644
 
     public Spigot spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 80f84a8..568072f 100644
+index a9ff641..3b660ff 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -252,9 +252,11 @@ public class CraftWorld implements World {
+@@ -255,9 +255,11 @@ public class CraftWorld implements World {
         net.minecraft.server.Chunk chunk = world.chunkProviderServer.chunks.get(LongHash.toLong(x, z));
 
         if (chunk == null) {
--- a/CraftBukkit-Patches/0037-Player-Collision-API.patch
+++ b/CraftBukkit-Patches/0037-Player-Collision-API.patch
@ -1,11 +1,11 @@
-From 94086c5408d66e1ddf9cf3c498c1934195556399 Mon Sep 17 00:00:00 2001
+From 8e8e24f2157500392cf8ecd4df26986b730907ee Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 3 Aug 2013 19:27:07 +1000
 Subject: [PATCH] Player Collision API


 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 7546107..ecde3d6 100644
+index 7eb41e1..b65c225 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -427,6 +427,7 @@ public abstract class EntityHuman extends EntityLiving {
@ -38,7 +38,7 @@ index 6bb5428..2d14a0d 100644
                 Entity entity = (Entity) list.get(i);
                 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index b212f29..dc92ccf 100644
+index 7af2f28..fcefe68 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -62,6 +62,21 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -64,10 +64,10 @@ index b212f29..dc92ccf 100644
     public EntityPlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile, PlayerInteractManager playerinteractmanager) {
         super(worldserver, gameprofile);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 36469db..d9c0540 100644
+index 9268686..dfef8cb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1315,6 +1315,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1318,6 +1318,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
     // Spigot start
     private final Player.Spigot spigot = new Player.Spigot()
     {
--- a/CraftBukkit-Patches/0040-Cap-Minimum-Player-Speed.patch
+++ b/CraftBukkit-Patches/0040-Cap-Minimum-Player-Speed.patch
@ -1,14 +1,14 @@
-From 94d31732d2b54954336f0333af90721d43514e21 Mon Sep 17 00:00:00 2001
+From bce30b24c98b7ed3c7966d7cfbe4d15d09252157 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Mon, 5 Aug 2013 20:17:20 +1000
 Subject: [PATCH] Cap Minimum Player Speed


 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d9c0540..b8dcea5 100644
+index dfef8cb..348b6e2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1179,7 +1179,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1182,7 +1182,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
     public void setFlySpeed(float value) {
         validateSpeed(value);
         EntityPlayer player = getHandle();
@ -17,7 +17,7 @@ index d9c0540..b8dcea5 100644
         player.updateAbilities();
 
     }
-@@ -1188,7 +1188,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1191,7 +1191,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
     public void setWalkSpeed(float value) {
         validateSpeed(value);
         EntityPlayer player = getHandle();
--- a/CraftBukkit-Patches/0046-Implement-respawn-API.patch
+++ b/CraftBukkit-Patches/0046-Implement-respawn-API.patch
@ -1,14 +1,14 @@
-From 76c0cd8eadad79d1d0364139c2460c7292cc0dc7 Mon Sep 17 00:00:00 2001
+From d54e960ee49e15b10bbd54010ab2f2ac8d04941b 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 b8dcea5..7851f21 100644
+index 348b6e2..272f7df 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1328,6 +1328,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1331,6 +1331,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
             getHandle().collidesWithEntities = collides;
             getHandle().k = collides; // First boolean of Entity
         }
--- a/CraftBukkit-Patches/0056-BungeeCord-Support.patch
+++ b/CraftBukkit-Patches/0056-BungeeCord-Support.patch
@ -1,4 +1,4 @@
-From 1a7b84867f4ee97511cf7cded475159a1991c7e8 Mon Sep 17 00:00:00 2001
+From 661d9a1d6d725387d016a63a85a67884ccf5c430 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
@ -119,7 +119,7 @@ index 97920b0..0b86011 100644
         this.d = EnumProtocol.a(packetdataserializer.e());
     }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 3b6e4f0..f0d1ada 100644
+index b370b6d..fdb4b3c 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -364,7 +364,7 @@ public abstract class PlayerList {
@ -151,10 +151,10 @@ index ce4857d..5c1cfaa 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 7851f21..a05f656 100644
+index 272f7df..2841e94 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1317,6 +1317,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1320,6 +1320,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
     {
 
         @Override
--- a/CraftBukkit-Patches/0061-Particle-API.patch
+++ b/CraftBukkit-Patches/0061-Particle-API.patch
@ -1,4 +1,4 @@
-From c1960cb2930f4daa7cfa1470b7ff42c0b137f1f4 Mon Sep 17 00:00:00 2001
+From 5e3d4b590b7f29e7f161c14ba275b9a8f99ed426 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Fri, 20 Dec 2013 21:36:06 +0000
 Subject: [PATCH] Particle API
@ -19,10 +19,10 @@ index 7de0de5..13f9e9d 100644
             datavalue = 0;
         }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 62340d3..6c6284b 100644
+index 3b660ff..eeb1ecb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -811,28 +811,18 @@ public class CraftWorld implements World {
+@@ -816,28 +816,18 @@ public class CraftWorld implements World {
             Validate.isTrue(effect.getData() == null, "Wrong kind of data for this effect!");
         }
 
@ -60,7 +60,7 @@ index 62340d3..6c6284b 100644
     }
 
     public <T extends Entity> T spawn(Location location, Class<T> clazz) throws IllegalArgumentException {
-@@ -1317,6 +1307,70 @@ public class CraftWorld implements World {
+@@ -1355,6 +1345,70 @@ public class CraftWorld implements World {
     // Spigot start
     private final Spigot spigot = new Spigot()
     {
@ -132,10 +132,10 @@ index 62340d3..6c6284b 100644
 
     public Spigot spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a05f656..141391a 100644
+index 2841e94..005d20f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1343,6 +1343,63 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1346,6 +1346,63 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
                 server.getServer().getPlayerList().moveToWorld( getHandle(), 0, false );
             }
         }
--- a/CraftBukkit-Patches/0066-Disable-Connected-Check-on-setScoreboard.patch
+++ b/CraftBukkit-Patches/0066-Disable-Connected-Check-on-setScoreboard.patch
@ -1,14 +1,14 @@
-From e921294b6e5ded9724f3cca90c44193e3d9d6b27 Mon Sep 17 00:00:00 2001
+From 45eca0436f77e26d507009ad52307ed0519517d3 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 bec510a..ee4289d 100644
+index 005d20f..c7eaca5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1240,7 +1240,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1243,7 +1243,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
             throw new IllegalStateException("Cannot set scoreboard yet");
         }
         if (playerConnection.isDisconnected()) {
--- a/CraftBukkit-Patches/0071-Improve-AutoSave-Mechanism.patch
+++ b/CraftBukkit-Patches/0071-Improve-AutoSave-Mechanism.patch
@ -1,4 +1,4 @@
-From 1726fd02fac28834745b15aac24be4c8f050de5b Mon Sep 17 00:00:00 2001
+From 8326bdd48e713856115000a07b0bb4cf12881e64 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 12 Jan 2014 21:07:18 +1100
 Subject: [PATCH] Improve AutoSave Mechanism
@ -47,10 +47,10 @@ index 7ce37c0..4a2f084 100644
             SpigotTimings.worldSaveTimer.stopTiming(); // Spigot
         }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 2545b38..d61c1de 100644
+index eeb1ecb..b8d30f5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -688,12 +688,17 @@ public class CraftWorld implements World {
+@@ -693,12 +693,17 @@ public class CraftWorld implements World {
     }
 
     public void save() {
--- a/CraftBukkit-Patches/0079-Implement-Locale-Getter-for-Players.patch
+++ b/CraftBukkit-Patches/0079-Implement-Locale-Getter-for-Players.patch
@ -1,11 +1,11 @@
-From 0745f0abfd310c791ef520dded687d7eebaa74c0 Mon Sep 17 00:00:00 2001
+From a42afa744e38980e8f3751a2396dcbe000c9b286 Mon Sep 17 00:00:00 2001
 From: Smove <jan@lavasurvival.net>
 Date: Sat, 1 Feb 2014 18:12:16 +1100
 Subject: [PATCH] Implement Locale Getter for Players


 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index f2adc82..9e1981f 100644
+index dafd55c..42b68e5 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -27,7 +27,7 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
@ -18,10 +18,10 @@ index f2adc82..9e1981f 100644
     public final MinecraftServer server;
     public final PlayerInteractManager playerInteractManager;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 772f85b..9ce0b2c 100644
+index c7eaca5..30025c0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1400,6 +1400,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1403,6 +1403,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
                 getHandle().playerConnection.sendPacket( packet );
             }
         }
--- a/CraftBukkit-Patches/0084-Add-support-for-fetching-hidden-players.patch
+++ b/CraftBukkit-Patches/0084-Add-support-for-fetching-hidden-players.patch
@ -1,14 +1,14 @@
-From 62573a7e6dae797956a1e43a78c57fcd93bd7c09 Mon Sep 17 00:00:00 2001
+From 2409be65c93259c8475c3e6f9636e8fef584a14d 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 9ce0b2c..025bae0 100644
+index 30025c0..1e11630 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1406,6 +1406,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1409,6 +1409,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
         {
            return getHandle().locale;
         }
--- a/CraftBukkit-Patches/0086-Cap-Channel-Registrations.patch
+++ b/CraftBukkit-Patches/0086-Cap-Channel-Registrations.patch
@ -1,14 +1,14 @@
-From dd50c6bd40232a7f970f235cabd621276dfdfe9c Mon Sep 17 00:00:00 2001
+From 7b53722e93ea82d5fc6cc5cc597f77fff4e32235 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 12 Feb 2014 20:02:58 +1100
 Subject: [PATCH] Cap Channel Registrations


 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 025bae0..fa357a0 100644
+index 1e11630..856e335 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1060,6 +1060,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1063,6 +1063,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
     }
 
     public void addChannel(String channel) {
--- a/CraftBukkit-Patches/0089-Implement-Silenceable-Lightning-API.patch
+++ b/CraftBukkit-Patches/0089-Implement-Silenceable-Lightning-API.patch
@ -1,4 +1,4 @@
-From bfda28449544f285799ef6200a7430b7912fd136 Mon Sep 17 00:00:00 2001
+From f0d91606b13a795735e851052e00301dff16fa52 Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Sun, 23 Feb 2014 16:16:59 -0400
 Subject: [PATCH] Implement Silenceable Lightning API
@ -39,10 +39,10 @@ index 5bda5d3..1bbce9b 100644
             //this.world.makeSound(this.locX, this.locY, this.locZ, "ambient.weather.thunder", 10000.0F, 0.8F + this.random.nextFloat() * 0.2F);
             float pitch = 0.8F + this.random.nextFloat() * 0.2F;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index c16f014..67c608a 100644
+index b8d30f5..bb4cb9d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1376,6 +1376,22 @@ public class CraftWorld implements World {
+@@ -1414,6 +1414,22 @@ public class CraftWorld implements World {
         {
             CraftWorld.this.playEffect( location, effect, 0 );
         }
--- a/CraftBukkit-Patches/0109-Expand-team-API-to-allow-arbitrary-strings.patch
+++ b/CraftBukkit-Patches/0109-Expand-team-API-to-allow-arbitrary-strings.patch
@ -1,14 +1,14 @@
-From ff3f4662ca0f5ce3b27b59287ed6bd398a3d4bf5 Mon Sep 17 00:00:00 2001
+From 13fb4a170030c19687976f68bede419a0bb5d1e2 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Thu, 17 Apr 2014 19:22:22 +1000
 Subject: [PATCH] Expand team API to allow arbitrary strings.


 diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
-index e38d109..a1864a5 100644
+index ecbf66b..7dd6138 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
-@@ -102,6 +102,19 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
+@@ -118,6 +118,19 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
         return players.build();
     }
 
@ -28,7 +28,7 @@ index e38d109..a1864a5 100644
     public int getSize() throws IllegalStateException {
         CraftScoreboard scoreboard = checkState();
 
-@@ -110,28 +123,50 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
+@@ -126,28 +139,50 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
 
     public void addPlayer(OfflinePlayer player) throws IllegalStateException, IllegalArgumentException {
         Validate.notNull(player, "OfflinePlayer cannot be null");
@ -83,9 +83,9 @@ index e38d109..a1864a5 100644
     }
 
     @Override
-@@ -142,26 +177,4 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
-         scoreboard.teams.remove(team.getName());
-         setUnregistered();
+@@ -188,26 +223,4 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
+                 throw new IllegalArgumentException("Unknown visibility level " + visibility);
+         }
     }
 -
 -    // Spigot start
--- a/CraftBukkit-Patches/0127-Better-item-validation.patch
+++ b/CraftBukkit-Patches/0127-Better-item-validation.patch
@ -1,4 +1,4 @@
-From 75cd54caa903d7a3dbf681ddd2043f7c8e3a9320 Mon Sep 17 00:00:00 2001
+From 76995d2eb6695918622671b6dc9cf019c73b4625 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
@ -102,12 +102,12 @@ index 0c69a3e..6843fac 100644
 
             addPage(pageArray);
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index fabaecf..cb6857c 100644
+index e80fce2..a4b09fa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -36,6 +36,10 @@ import com.google.common.base.Strings;
- import com.google.common.collect.ImmutableList;
- import com.google.common.collect.ImmutableMap;
+@@ -39,6 +39,10 @@ import com.google.common.collect.Sets;
+ import java.util.Arrays;
+ import java.util.Set;
 
 +// Spigot start
 +import static org.spigotmc.ValidateUtils.*;
@ -116,7 +116,7 @@ index fabaecf..cb6857c 100644
 /**
  * Children must include the following:
  *
-@@ -230,7 +234,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
+@@ -238,7 +242,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
             NBTTagCompound display = tag.getCompound(DISPLAY.NBT);
 
             if (display.hasKey(NAME.NBT)) {
@ -125,7 +125,7 @@ index fabaecf..cb6857c 100644
             }
 
             if (display.hasKey(LORE.NBT)) {
-@@ -238,7 +242,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
+@@ -246,7 +250,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
                 lore = new ArrayList<String>(list.size());
 
                 for (int index = 0; index < list.size(); index++) {
--- a/CraftBukkit-Patches/0135-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch
+++ b/CraftBukkit-Patches/0135-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch
@ -1,4 +1,4 @@
-From 4a4de9f1077b4da1b2e2f63fd4db574d6fc40265 Mon Sep 17 00:00:00 2001
+From dce54a9f0bae980bea110133f6f6acc8470bdc58 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
@ -26,10 +26,10 @@ index a6b72d8..0f5d09b 100644
                 EntityOcelot entityocelot = new EntityOcelot(this.world);
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 67c608a..ae6efcb 100644
+index bb4cb9d..c6ef0fd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1057,6 +1057,12 @@ public class CraftWorld implements World {
+@@ -1086,6 +1086,12 @@ public class CraftWorld implements World {
         }
 
         if (entity != null) {
--- a/CraftBukkit-Patches/0136-Prevent-a-crash-involving-attributes.patch
+++ b/CraftBukkit-Patches/0136-Prevent-a-crash-involving-attributes.patch
@ -1,14 +1,14 @@
-From 967eec7b6d0f5284862f1cb9c71bed17896390bf Mon Sep 17 00:00:00 2001
+From 0a8fa20c8b53fd998621fd4b9a4e6ec3e92fed58 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Sat, 19 Jul 2014 19:54:41 +0100
 Subject: [PATCH] Prevent a crash involving attributes


 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index fa357a0..8700b18 100644
+index 856e335..f291a66 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1310,7 +1310,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1313,7 +1313,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
                 break;
             }
         }
--- a/CraftBukkit-Patches/0145-Filter-attribute-modifiers-which-cause-the-attribute.patch
+++ b/CraftBukkit-Patches/0145-Filter-attribute-modifiers-which-cause-the-attribute.patch
@ -1,4 +1,4 @@
-From 726e89fcaa45d9106f9201065c6437890382dff7 Mon Sep 17 00:00:00 2001
+From 5718134f3ad1182f999b037536cda880ef1734c2 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Thu, 31 Jul 2014 17:48:20 +0100
 Subject: [PATCH] Filter attribute modifiers which cause the attribute to go
@ -6,10 +6,10 @@ Subject: [PATCH] Filter attribute modifiers which cause the attribute to go


 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index cb6857c..b42baa9 100644
+index a4b09fa..3a87cb7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -38,6 +38,8 @@ import com.google.common.collect.ImmutableMap;
+@@ -41,6 +41,8 @@ import java.util.Set;
 
 // Spigot start
 import static org.spigotmc.ValidateUtils.*;
@ -18,7 +18,7 @@ index cb6857c..b42baa9 100644
 // Spigot end
 
 /**
-@@ -259,6 +261,123 @@ class CraftMetaItem implements ItemMeta, Repairable {
+@@ -267,6 +269,123 @@ class CraftMetaItem implements ItemMeta, Repairable {
             NBTTagList save = null;
             NBTTagList nbttaglist = tag.getList(ATTRIBUTES.NBT, 10);
 
--- a/CraftBukkit-Patches/0148-Remove-uneeded-validation.patch
+++ b/CraftBukkit-Patches/0148-Remove-uneeded-validation.patch
@ -1,14 +1,14 @@
-From 47c42b134d369d28d6634722a02e025efbcebedf Mon Sep 17 00:00:00 2001
+From 43956e23dbfcb9e5210bf49f6f319aba613ce870 Mon Sep 17 00:00:00 2001
 From: drXor <mcyoung@mit.edu>
 Date: Fri, 15 Aug 2014 18:11:09 -0400
 Subject: [PATCH] Remove uneeded validation


 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index b42baa9..d6e4023 100644
+index 3a87cb7..070b23a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -512,7 +512,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
+@@ -531,7 +531,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
     }
 
     static void applyEnchantments(Map<Enchantment, Integer> enchantments, NBTTagCompound tag, ItemMetaKey key) {
@ -17,7 +17,7 @@ index b42baa9..d6e4023 100644
             return;
         }
 
-@@ -603,7 +603,14 @@ class CraftMetaItem implements ItemMeta, Repairable {
+@@ -622,7 +622,14 @@ class CraftMetaItem implements ItemMeta, Repairable {
     }
 
     public boolean removeEnchant(Enchantment ench) {
--- a/CraftBukkit-Patches/0151-Skip-invalid-enchants-in-CraftMetaItem.patch
+++ b/CraftBukkit-Patches/0151-Skip-invalid-enchants-in-CraftMetaItem.patch
@ -1,4 +1,4 @@
-From 84d315fcfac69a89a465a3763052518ecd433ade Mon Sep 17 00:00:00 2001
+From 3477d2abe2aa44adae986e2ca1490f6fc86f16bd Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Tue, 19 Aug 2014 11:04:21 +0100
 Subject: [PATCH] Skip invalid enchants in CraftMetaItem
@ -8,10 +8,10 @@ CraftMetaItem would add a null enchantment into the enchantment map which causes
 NullPointers later

 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index d6e4023..6298d58 100644
+index 070b23a..e011d85 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -435,7 +435,11 @@ class CraftMetaItem implements ItemMeta, Repairable {
+@@ -450,7 +450,11 @@ class CraftMetaItem implements ItemMeta, Repairable {
             int id = 0xffff & ((NBTTagCompound) ench.get(i)).getShort(ENCHANTMENTS_ID.NBT);
             int level = 0xffff & ((NBTTagCompound) ench.get(i)).getShort(ENCHANTMENTS_LVL.NBT);
 
--- a/CraftBukkit-Patches/0153-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch
+++ b/CraftBukkit-Patches/0153-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch
@ -1,14 +1,14 @@
-From 48f78d86797015136f7864d705e8116372f0daaf Mon Sep 17 00:00:00 2001
+From 36e273b2b516f86a27d567b67034e1be87d26e76 Mon Sep 17 00:00:00 2001
 From: libraryaddict <redwarfare@live.com>
 Date: Fri, 22 Aug 2014 05:35:16 -0400
 Subject: [PATCH] Added isUnbreakable and setUnbreakable to ItemMeta


 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 6298d58..a3bc76d 100644
+index e011d85..0ee8280 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -204,6 +204,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
+@@ -207,6 +207,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
     static final ItemMetaKey ATTRIBUTES_UUID_HIGH = new ItemMetaKey("UUIDMost");
     @Specific(Specific.To.NBT)
     static final ItemMetaKey ATTRIBUTES_UUID_LOW = new ItemMetaKey("UUIDLeast");
@ -16,17 +16,17 @@ index 6298d58..a3bc76d 100644
 
     private String displayName;
     private List<String> lore;
-@@ -229,6 +230,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
- 
+@@ -237,6 +238,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
         this.repairCost = meta.repairCost;
         this.attributes = meta.attributes;
+         this.unhandledTags.putAll(meta.unhandledTags);
 +        spigot.setUnbreakable( meta.spigot.isUnbreakable() ); // Spigot
     }
 
     CraftMetaItem(NBTTagCompound tag) {
-@@ -421,6 +423,12 @@ class CraftMetaItem implements ItemMeta, Repairable {
-         } else {
-             attributes = null;
+@@ -436,6 +438,12 @@ class CraftMetaItem implements ItemMeta, Repairable {
+                 unhandledTags.put(key, tag.get(key));
+             }
         }
 +        // Spigot start
 +        if ( tag.hasKey( UNBREAKABLE.NBT ) )
@ -37,7 +37,7 @@ index 6298d58..a3bc76d 100644
     }
 
     static Map<Enchantment, Integer> buildEnchantments(NBTTagCompound tag, ItemMetaKey key) {
-@@ -461,6 +469,13 @@ class CraftMetaItem implements ItemMeta, Repairable {
+@@ -476,6 +484,13 @@ class CraftMetaItem implements ItemMeta, Repairable {
         }
 
         attributes = null;
@ -51,7 +51,7 @@ index 6298d58..a3bc76d 100644
     }
 
     static Map<Enchantment, Integer> buildEnchantments(Map<String, Object> map, ItemMetaKey key) {
-@@ -493,6 +508,13 @@ class CraftMetaItem implements ItemMeta, Repairable {
+@@ -508,6 +523,13 @@ class CraftMetaItem implements ItemMeta, Repairable {
 
         applyEnchantments(enchantments, itemTag, ENCHANTMENTS);
 
@ -65,33 +65,34 @@ index 6298d58..a3bc76d 100644
         if (hasRepairCost()) {
             itemTag.setInt(REPAIR.NBT, repairCost);
         }
-@@ -551,7 +573,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
+@@ -570,7 +592,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
 
     @Overridden
     boolean isEmpty() {
-        return !(hasDisplayName() || hasEnchants() || hasLore() || hasAttributes() || hasRepairCost());
-+        return !(hasDisplayName() || hasEnchants() || hasLore() || hasAttributes() || hasRepairCost() || spigot.isUnbreakable()); // Spigot
+-        return !(hasDisplayName() || hasEnchants() || hasLore() || hasAttributes() || hasRepairCost() || !unhandledTags.isEmpty());
+        return !(hasDisplayName() || hasEnchants() || hasLore() || hasAttributes() || hasRepairCost() || !unhandledTags.isEmpty() || spigot.isUnbreakable()); // Spigot
     }
 
     public String getDisplayName() {
-@@ -675,7 +697,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
-                 && (this.hasEnchants() ? that.hasEnchants() && this.enchantments.equals(that.enchantments) : !that.hasEnchants())
+@@ -695,7 +717,8 @@ class CraftMetaItem implements ItemMeta, Repairable {
                 && (this.hasLore() ? that.hasLore() && this.lore.equals(that.lore) : !that.hasLore())
                 && (this.hasAttributes() ? that.hasAttributes() && this.attributes.equals(that.attributes) : !that.hasAttributes())
-                && (this.hasRepairCost() ? that.hasRepairCost() && this.repairCost == that.repairCost : !that.hasRepairCost());
-+                && (this.hasRepairCost() ? that.hasRepairCost() && this.repairCost == that.repairCost : !that.hasRepairCost()) && this.spigot.isUnbreakable() == that.spigot.isUnbreakable(); // Spigot
+                 && (this.hasRepairCost() ? that.hasRepairCost() && this.repairCost == that.repairCost : !that.hasRepairCost())
+-                && (this.unhandledTags.equals(that.unhandledTags));
+                && (this.unhandledTags.equals(that.unhandledTags))
+                && this.spigot.isUnbreakable() == that.spigot.isUnbreakable(); // Spigot
     }
 
     /**
-@@ -701,6 +723,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
-         hash = 61 * hash + (hasEnchants() ? this.enchantments.hashCode() : 0);
+@@ -722,6 +745,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
         hash = 61 * hash + (hasAttributes() ? this.attributes.hashCode() : 0);
         hash = 61 * hash + (hasRepairCost() ? this.repairCost : 0);
+         hash = 61 * hash + unhandledTags.hashCode();
 +        hash = 61 * hash + (spigot.isUnbreakable() ? 1231 : 1237); // Spigot
         return hash;
     }
 
-@@ -744,6 +767,13 @@ class CraftMetaItem implements ItemMeta, Repairable {
+@@ -765,6 +789,13 @@ class CraftMetaItem implements ItemMeta, Repairable {
             builder.put(REPAIR.BUKKIT, repairCost);
         }
 
@ -105,7 +106,15 @@ index 6298d58..a3bc76d 100644
         return builder;
     }
 
-@@ -806,6 +836,19 @@ class CraftMetaItem implements ItemMeta, Repairable {
+@@ -827,6 +858,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
+     public static Set<String> getHandledTags() {
+         if (HANDLED_TAGS.isEmpty()) {
+             HANDLED_TAGS.addAll(Arrays.asList(
+                UNBREAKABLE.NBT, // Spigot
+                 DISPLAY.NBT,
+                 REPAIR.NBT,
+                 ATTRIBUTES.NBT,
+@@ -851,6 +883,19 @@ class CraftMetaItem implements ItemMeta, Repairable {
     // Spigot start
     private final Spigot spigot = new Spigot()
     {
--- a/CraftBukkit-Patches/0154-Configurable-Hanging-Tick.patch
+++ b/CraftBukkit-Patches/0154-Configurable-Hanging-Tick.patch
@ -1,14 +1,14 @@
-From a2a0d41f68f877aceee931cf74561c5943424ec4 Mon Sep 17 00:00:00 2001
+From e985b7bb2a3401c6278e5089baa34924aee8eb11 Mon Sep 17 00:00:00 2001
 From: drXor <mcyoung@mit.edu>
 Date: Sat, 9 Aug 2014 13:56:51 -0400
 Subject: [PATCH] Configurable Hanging Tick


 diff --git a/src/main/java/net/minecraft/server/EntityHanging.java b/src/main/java/net/minecraft/server/EntityHanging.java
-index 76bc12a..d34e5bf 100644
+index 6570340..b74c55e 100644
 --- a/src/main/java/net/minecraft/server/EntityHanging.java
 +++ b/src/main/java/net/minecraft/server/EntityHanging.java
-@@ -81,7 +81,7 @@ public abstract class EntityHanging extends Entity {
+@@ -99,7 +99,7 @@ public abstract class EntityHanging extends Entity {
         this.lastX = this.locX;
         this.lastY = this.locY;
         this.lastZ = this.locZ;
--- a/CraftBukkit-Patches/0158-BungeeCord-Chat-API.patch
+++ b/CraftBukkit-Patches/0158-BungeeCord-Chat-API.patch
@ -1,4 +1,4 @@
-From 05fe4a53b170c3b9e66d794521448c8e39009056 Mon Sep 17 00:00:00 2001
+From a55031efdfc7db45e85a65da6289f56e665d862e Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 13 Dec 2014 13:06:05 +1100
 Subject: [PATCH] BungeeCord Chat API
@ -91,7 +91,7 @@ index 8b4b580..980dd99 100644
 
     public Spigot spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8700b18..cb65795 100644
+index f291a66..9167baf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -18,6 +18,7 @@ import java.util.Set;
@ -102,7 +102,7 @@ index 8700b18..cb65795 100644
 
 import net.minecraft.server.*;
 
-@@ -1427,6 +1428,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1430,6 +1431,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
 
             return java.util.Collections.unmodifiableSet( ret );
         }