Upstream merge.

Bukkit-Patches/0001-POM-Changes.patch

@@ -1,40 +1,33 @@
-From e6075fce1256fa944083c6cde3b1e47fac360979 Mon Sep 17 00:00:00 2001
+From e17c2827099e58c8f95512ba2e9c71e594a9929b 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 f1efef0..7073202 100644
+index 4d5a7cf..2122a38 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -1,15 +1,22 @@
+@@ -9,14 +9,14 @@
- <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">
+         <version>9</version>
-     <modelVersion>4.0.0</modelVersion>
+     </parent>
+ 
 -    <groupId>org.bukkit</groupId>
 -    <artifactId>bukkit</artifactId>
 +    <groupId>org.spigotmc</groupId>
 +    <artifactId>spigot-api</artifactId>
      <version>1.8-R0.1-SNAPSHOT</version>
+     <packaging>jar</packaging>
+ 
 -    <name>Bukkit</name>
--    <url>http://www.bukkit.org</url>
+-    <url>http://www.bukkit.org/</url>
+-    <description>A plugin API for Minecraft servers.</description>
 +    <name>Spigot-API</name>
-+    <url>http://www.spigotmc.org</url>
++    <url>http://www.spigotmc.org/</url>
++    <description>An enhanced plugin API for Minecraft servers.</description>
  
      <properties>
-         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+         <maven.compiler.source>1.6</maven.compiler.source>
-     </properties>
- 
-+    <repositories>
-+        <repository>
-+            <id>sonatype-snapshots</id>
-+            <url>https://oss.sonatype.org/content/repositories/public</url>
-+        </repository>
-+    </repositories>
-+
-     <distributionManagement>
-         <repository>
-             <id>spigotmc-releases</id>
 -- 
 2.1.0
 

Bukkit-Patches/0002-Spigot-Timings.patch

@@ -1,4 +1,4 @@
-From e0dd51b693e4ae9448c48f2620665f45180dc154 Mon Sep 17 00:00:00 2001
+From b3f870865904a4912b8431479e6b8558a668acac 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/0003-Add-PlayerItemDamageEvent.patch

@@ -1,4 +1,4 @@
-From 11c6135ee84b7fa384873f93a2042c209fe8e708 Mon Sep 17 00:00:00 2001
+From 499b017c14c23d4e782c5f82754d9a8c245e248c Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Mon, 4 Mar 2013 18:31:20 +1100
 Subject: [PATCH] Add PlayerItemDamageEvent

Bukkit-Patches/0004-BungeeCord-Support.patch

@@ -1,4 +1,4 @@
-From e626b687c08aaa6e2370f373e29ac3ba08808a0f Mon Sep 17 00:00:00 2001
+From 2e0e07042d88c18a87ff067983dd66d3744d390b 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 96be6d6c2b82d8f14913ca150eb9d937ae6a71c9 Mon Sep 17 00:00:00 2001
+From 3c46c4cb9e66cda8de15fc32a5d8210ef10f76a0 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-Add-Particle-API.patch

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

Bukkit-Patches/0007-Define-EntitySpawnEvent-and-SpawnerSpawnEvent.patch

@@ -1,4 +1,4 @@
-From bddf7e37af12bf5f8ff0e317ec382ebd3e84b227 Mon Sep 17 00:00:00 2001
+From 3df6151ebd32243ea5a07ab3910c97767043fbb3 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 EntitySpawnEvent and SpawnerSpawnEvent

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

@@ -1,4 +1,4 @@
-From 5e95a21093480d5a64809416e504163bb6a91b3f Mon Sep 17 00:00:00 2001
+From 258aaba45209444e895f5c267621eba138f72245 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/0009-InventoryClickEvent-getClickedInventory.patch

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

Bukkit-Patches/0010-Added-getAllSessionData-to-the-Conversation-API.patch

@@ -1,4 +1,4 @@
-From 04e44bad00eb86f4723436b1e8dcf377be1d3e87 Mon Sep 17 00:00:00 2001
+From 3d168469883ae014cc57d4cd369123b72a5485a8 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.

Bukkit-Patches/0011-Catch-Conversation-API-Errors.patch

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

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

@@ -1,4 +1,4 @@
-From 8a019743c81d52066ffdbf4b0248d7c01fe97a75 Mon Sep 17 00:00:00 2001
+From 06754791e35ebac7bab755ce426582034a773531 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/0013-Expand-Boolean-Prompt-Values.patch

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

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

@@ -1,4 +1,4 @@
-From 0a5c11f342f2957ea2952a4094d7c010a546ece6 Mon Sep 17 00:00:00 2001
+From 1153781904c43b7e80fdd69b05f9b22026cfec29 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/0015-Add-respawn-API.patch

@@ -1,4 +1,4 @@
-From d8eda3500bc5195f6b3dfb04180da5c871c36bd9 Mon Sep 17 00:00:00 2001
+From 505288d22810395469ef4c17aac27320c67bd0db 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/0016-Fix-Plugin-Message-API-Disconnects.patch

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

Bukkit-Patches/0017-Fix-Tab-Completion-for-Some-Commands.patch

@@ -1,4 +1,4 @@
-From 471ff3ec25981a3da53767a8fbfc3e1e19eadf4c Mon Sep 17 00:00:00 2001
+From 0360a12d5bbf44b37e3266777b7032c4e158a69d 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

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

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

@@ -1,4 +1,4 @@
-From 4193bbb2263c9c7cf7a7df9af84cbda545e98736 Mon Sep 17 00:00:00 2001
+From 94a801c563b172d6e9baa3869b512c13aaeed33b 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/0020-Silenceable-Lightning-API.patch

@@ -1,4 +1,4 @@
-From 153ca8d846ba5d85fae7bca99b92cea7d7d1a50a Mon Sep 17 00:00:00 2001
+From dddf63f99fe12e810fec21e34b24dadbc4e2f6ab 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/0021-Remove-deprecation-on-some-player-lookup-methods.patch

@@ -1,4 +1,4 @@
-From bd07f66fc3a3c404c56c48d322e73a9673cf41b8 Mon Sep 17 00:00:00 2001
+From c3c2627f7bba578a12b623098409eac20635670c 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/0022-Expand-team-API-to-allow-arbitrary-strings.patch

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

Bukkit-Patches/0023-Add-Score.isScoreSet-Z-API.patch

@@ -1,4 +1,4 @@
-From 469503883eb7f346571db3061ff541a59e8d0ba8 Mon Sep 17 00:00:00 2001
+From 0c00297d4dff804a125bc58cd10e05f27b6517bf 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.

Bukkit-Patches/0024-Add-PlayerSpawnLocationEvent.patch

@@ -1,4 +1,4 @@
-From 4a69eee241ad670d823f4157fb9ce2071892f265 Mon Sep 17 00:00:00 2001
+From cc59d3746763657df3c19c89fe06739fd5266c46 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/0025-Ease-ClassLoader-Deadlocks-Where-Possible.patch

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

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

@@ -1,4 +1,4 @@
-From 6b52917cc8b01a0112e079901e41ff7058d73dd9 Mon Sep 17 00:00:00 2001
+From adf4f9717e8251ecc2ee484c5e8b419b8f774216 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.

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

@@ -1,4 +1,4 @@
-From c4c0793fc637e999eb32e4b80993a4470e817cf2 Mon Sep 17 00:00:00 2001
+From f8cb5bb43e40ad480abd714f1e8035c628fb29c1 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/0028-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch

@@ -1,4 +1,4 @@
-From 5a841f768fe9693f2c7091542a7609da32915445 Mon Sep 17 00:00:00 2001
+From 2331761cccd87e36c9ca4d2de09ff3e465d8607b 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/0029-BungeeCord-Chat-API.patch

@@ -1,16 +1,16 @@
-From 7b1c278c2600c9d0434f03ce82dca8038f2a68d8 Mon Sep 17 00:00:00 2001
+From b72b4394bf221fc8021dd5f7383a3b3ec7eaabfe 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 7073202..89c1ade 100644
+index 2122a38..44aa858 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -118,6 +118,13 @@
+@@ -77,6 +77,14 @@
-             <artifactId>commons-lang</artifactId>
+             <version>1.14</version>
-             <version>2.6</version>
+             <scope>compile</scope>
          </dependency>
 +        <dependency>
 +            <groupId>net.md-5</groupId>
@@ -19,9 +19,10 @@ index 7073202..89c1ade 100644
 +            <type>jar</type>
 +            <scope>compile</scope>
 +        </dependency>
- 
++
          <!-- testing -->
          <dependency>
+             <groupId>junit</groupId>
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
 index 57b2794..cf4ab1d 100644
 --- a/src/main/java/org/bukkit/Server.java

CraftBukkit-Patches/0001-POM-Changes.patch

@@ -1,4 +1,4 @@
-From 937e9038a288a440b7027378e856e79f33ce3da7 Mon Sep 17 00:00:00 2001
+From c6953dc30ed342ede3d1f0396fa93b47bf0a647f 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 5c0c6c9..07077da 100644
+index a0d4db6..8c4a517 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,12 +1,12 @@
@@ -26,8 +26,8 @@ index 5c0c6c9..07077da 100644
  
    <properties>
      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-@@ -18,10 +18,17 @@
+@@ -20,10 +20,17 @@
-     <buildtag.suffix></buildtag.suffix>
+     <maven.compiler.target>1.6</maven.compiler.target>
    </properties>
  
 +  <parent>
@@ -46,7 +46,7 @@ index 5c0c6c9..07077da 100644
        <version>${project.version}</version>
        <type>jar</type>
        <scope>compile</scope>
-@@ -83,21 +90,39 @@
+@@ -93,21 +100,39 @@
  
    <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
    <build>
@@ -89,7 +89,7 @@ index 5c0c6c9..07077da 100644
              <phase>compile</phase>
              <goals>
                <goal>gitdescribe</goal>
-@@ -114,7 +139,7 @@
+@@ -124,7 +149,7 @@
              <manifestEntries>
                <Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
                <Implementation-Title>CraftBukkit</Implementation-Title>

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

@@ -1,4 +1,4 @@
-From 551a13859b2fc907a98be3a692218e49b078b05b Mon Sep 17 00:00:00 2001
+From 449f5e3dec8e53e304d9fd0ebaf538213323fc97 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

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

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

CraftBukkit-Patches/0004-Obfuscation-Helpers.patch

@@ -1,4 +1,4 @@
-From 14b6494829449183067239826ef42917bc293e0b Mon Sep 17 00:00:00 2001
+From ab476d816607afbd11988be3f340b97f31621b2a Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 14 Apr 2014 10:38:04 +1000
 Subject: [PATCH] Obfuscation Helpers

CraftBukkit-Patches/0005-Spigot-Configuration.patch

@@ -1,4 +1,4 @@
-From 61c6477329d330759663f728fcda40d96294f981 Mon Sep 17 00:00:00 2001
+From e0dfb516ccafe1b53dacfcedbf3ce60a713f6d02 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
@@ -35,7 +35,7 @@ index 29c0a34..424b71d 100644
              if (!this.getOnlineMode()) {
                  DedicatedServer.LOGGER.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!");
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index a8aeca1..b15988a 100644
+index 8dde097..3c1ba5b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -98,6 +98,7 @@ public abstract class World implements IBlockAccess {

CraftBukkit-Patches/0006-Better-Chunk-Tick-Selection.patch

@@ -1,4 +1,4 @@
-From 7495c1e3084f2499ff0b84d267ccaab8e603deb4 Mon Sep 17 00:00:00 2001
+From 53420058405e88f0241e159fcbf2daac78e23ec4 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 11 Jun 2013 12:56:02 +1000
 Subject: [PATCH] Better Chunk Tick Selection

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

@@ -1,4 +1,4 @@
-From 52222eafdefa08bdd3beffe3275b7e91656e1366 Mon Sep 17 00:00:00 2001
+From d09db6f3c8118a3db04aae6cef53c956ecbe0995 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 17:17:20 +1000
 Subject: [PATCH] Crop Growth Rates

CraftBukkit-Patches/0008-More-Efficient-Chunk-Save-Queue.patch

@@ -1,4 +1,4 @@
-From c7a1c266931bc601635974cfec17f4b51c766600 Mon Sep 17 00:00:00 2001
+From 6aa881310b062a6a3287cf6022bc0ec90ffa9154 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 11 Jun 2013 12:09:45 +1000
 Subject: [PATCH] More Efficient Chunk Save Queue

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

@@ -1,4 +1,4 @@
-From 25c237591f775570916eaeb6fa7dec298e1e3974 Mon Sep 17 00:00:00 2001
+From 0887efe6c6b4897eca217be4a2fb46e072215033 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
@@ -41,7 +41,7 @@ index e2c0712..7f16401 100644
                      }
                  } else {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index db05ee3..57aba85 100644
+index 6d8a5e8..30b5fed 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -923,6 +923,23 @@ public abstract class World implements IBlockAccess {

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

@@ -1,4 +1,4 @@
-From 0142d5b90cccc709bbb014d243ca84380ee8bb6b Mon Sep 17 00:00:00 2001
+From 6e0e7a59a4df1f9e0b631eef3bad68a2cbcea9aa 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

CraftBukkit-Patches/0011-View-Distance.patch

@@ -1,4 +1,4 @@
-From 86d5f2c6cb1066f6ae83fffff61c0f3927b47103 Mon Sep 17 00:00:00 2001
+From 462935f94f735e011edb8aaad10512f213738bb7 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

CraftBukkit-Patches/0012-Spigot-Timings.patch

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

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

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

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

@@ -1,11 +1,11 @@
-From ed15190e5b24a867ff643915e9c4dd707a64c1bd Mon Sep 17 00:00:00 2001
+From 5742a233d981dce73e19c330e130ad38bb589c4d 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 ca9984b..a80c375 100644
+index 06bd661..b6a509c 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1318,6 +1318,13 @@ public abstract class World implements IBlockAccess {

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

@@ -1,4 +1,4 @@
-From 057ad55b4ed8cb107d9e5f498196b6e2dfc6b1be Mon Sep 17 00:00:00 2001
+From 6c932294f59e279a29fc26b287e6b4b76f71ff53 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,7 +9,7 @@ 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 3577d1f..de80728 100644
+index 05213eb..33709ce 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -89,14 +89,14 @@ public abstract class Entity implements ICommandListener {
@@ -163,7 +163,7 @@ index c7fb84b..6bb5428 100644
      public void G() {
          this.damageEntity(DamageSource.OUT_OF_WORLD, Float.MAX_VALUE);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index a80c375..5ce3f41 100644
+index b6a509c..d85479b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1258,6 +1258,7 @@ public abstract class World implements IBlockAccess {

CraftBukkit-Patches/0016-Metrics.patch

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

CraftBukkit-Patches/0017-PlayerItemDamageEvent.patch

@@ -1,4 +1,4 @@
-From 91ac812c8ff8d8c0cfd0815ce8fa1eef5b8bb6f2 Mon Sep 17 00:00:00 2001
+From b4306dcb539d3b55885f8c9b82fff57093e56f78 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Mon, 4 Mar 2013 18:45:52 +1100
 Subject: [PATCH] PlayerItemDamageEvent

CraftBukkit-Patches/0018-Prevent-NPE-in-CraftSign.patch

@@ -1,4 +1,4 @@
-From 8fe0318e77d7eb652ca2f006df4120332decf800 Mon Sep 17 00:00:00 2001
+From 2d3d499e780c2232797b30385258f86e79f4d6b9 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Mon, 18 Mar 2013 20:01:44 +1100
 Subject: [PATCH] Prevent NPE in CraftSign

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

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

CraftBukkit-Patches/0020-Thread-Naming-and-Tweaks.patch

@@ -1,4 +1,4 @@
-From d947cd0d45c4886112df610c3c98829fb39de691 Mon Sep 17 00:00:00 2001
+From 85c72fb0ddc5ef591d8c19dda00f3a811893628e Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 23 Apr 2013 11:50:27 +1000
 Subject: [PATCH] Thread Naming and Tweaks

CraftBukkit-Patches/0021-Close-Unloaded-Save-Files.patch

@@ -1,4 +1,4 @@
-From 9d32f66b46736cdb2ee51f6c7a2bac83c258fde4 Mon Sep 17 00:00:00 2001
+From 61039f65756b60e8da46aa8d56f1bd2ac68b8044 Mon Sep 17 00:00:00 2001
 From: Antony Riley <antony@cyberiantiger.org>
 Date: Wed, 27 Mar 2013 01:41:54 +0200
 Subject: [PATCH] Close Unloaded Save Files

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

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

CraftBukkit-Patches/0023-Recipe-Deconstruction.patch

@@ -1,4 +1,4 @@
-From ba83b1f7a28a15a4ac097a48a52e24822b89afd6 Mon Sep 17 00:00:00 2001
+From afa43bd776d163b02dd9d91b9d2afa837548baff Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 1 Jun 2013 16:34:38 +1000
 Subject: [PATCH] Recipe Deconstruction

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

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

CraftBukkit-Patches/0025-Hopper-Customisations.patch

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

CraftBukkit-Patches/0026-Implement-SpawnerSpawnEvent.patch

@@ -1,4 +1,4 @@
-From 3c33825d88469c5c9ba8e930ce959225ddd71801 Mon Sep 17 00:00:00 2001
+From b1ab1f86b3f498bc176de5c3d7cfa8e805bd1b8b Mon Sep 17 00:00:00 2001
 From: Andy Shulman <andy.shulman@hotmail.com>
 Date: Mon, 15 Apr 2013 20:06:37 -0500
 Subject: [PATCH] Implement SpawnerSpawnEvent.
@@ -63,7 +63,7 @@ index fe24b1f..ebcba7b 100644
  
          return entity;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 391e5b9..96c7344 100644
+index 60e2a4f..dd0cab1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -18,6 +18,7 @@ import org.bukkit.Statistic.Type;

CraftBukkit-Patches/0027-Firework-Meta-Crash-Fix.patch

@@ -1,4 +1,4 @@
-From 5cbafc9141a291ea267bdecb1f83c895e6b4ef78 Mon Sep 17 00:00:00 2001
+From 14ea2aea77b5ac48ece2ec24239ac7a337d78056 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 15 Jun 2013 21:34:48 +1000
 Subject: [PATCH] Firework Meta Crash Fix

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

@@ -1,11 +1,11 @@
-From a80867a03656596ef9359d3c91c1660e09ae37af Mon Sep 17 00:00:00 2001
+From c3135b0029daa39d97988e6e4476ed6626503852 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 7863f9b..dd7b0c2 100644
+index fad01f3..77e04a1 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1045,6 +1045,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList

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

@@ -1,4 +1,4 @@
-From 2e5017e3c36ccf3bf99e3bb78682f6ee364962a0 Mon Sep 17 00:00:00 2001
+From 36db424939a337a3a8e7434472cc96aa1600cb6f 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

CraftBukkit-Patches/0030-Configurable-Messages.patch

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

CraftBukkit-Patches/0031-Allow-Disabling-of-Random-Lighting-Updates.patch

@@ -1,4 +1,4 @@
-From c29a5303addd4314733282e7d62c30b8afa6a960 Mon Sep 17 00:00:00 2001
+From 6faa338d786eb8df93d3e2e6cb15badfcda7a0ea Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 22 Jun 2013 16:12:02 +1000
 Subject: [PATCH] Allow Disabling of Random Lighting Updates

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

@@ -1,4 +1,4 @@
-From 0131eb77a3156db559cca4e0592c695665ae9276 Mon Sep 17 00:00:00 2001
+From 363db70cd9465e2054a6c1303b8d3d1698ba364d 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

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

@@ -1,11 +1,11 @@
-From ce4ce90263be61f101193f1d3de7e37d9c627c38 Mon Sep 17 00:00:00 2001
+From cd3eee8a0d7c034b59ff3f9a008a8048c3d86382 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 dd7b0c2..65dd171 100644
+index 77e04a1..bd92555 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1179,6 +1179,13 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList

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

@@ -1,11 +1,11 @@
-From 3a064ce3b5c693ba2a718a188ae072176dcf838c Mon Sep 17 00:00:00 2001
+From 503fab3aa66ad3ab3e26d04446905dc1f1f78ce9 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 2 Jul 2013 20:32:49 +1000
 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 c4cf603..ad48ca8 100644
+index 33709ce..bcb815c 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1544,6 +1544,7 @@ public abstract class Entity implements ICommandListener {

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

@@ -1,4 +1,4 @@
-From 6883d850edaa69cf6aee9617aca0064c48c46f0d Mon Sep 17 00:00:00 2001
+From 8b42dfb535896005418744a289fa89140c388497 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

CraftBukkit-Patches/0036-Plug-World-Unload-Memory-Leak.patch

@@ -1,4 +1,4 @@
-From 6f633a55450073b31c4a3647f1094a41a2295837 Mon Sep 17 00:00:00 2001
+From eec5db4ed775ab782ef0e144ab4376165bcb37e4 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 3 Aug 2013 19:02:59 +1000
 Subject: [PATCH] Plug World Unload Memory Leak

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

@@ -1,4 +1,4 @@
-From 5fbb44f7cf8920d0b54ab7f36c341ad454ef9475 Mon Sep 17 00:00:00 2001
+From 9b8b992e0eef3ccb396d756be6665fa8d37367b0 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
@@ -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 7af2f28..fcefe68 100644
+index 69229da..768a743 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 {

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

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

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

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

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

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

CraftBukkit-Patches/0041-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch

@@ -1,4 +1,4 @@
-From 72b9adcdbc960562097f32f4d8907255ef6923d4 Mon Sep 17 00:00:00 2001
+From 18daf09c9f1b8f214badecdeb37764de3e3b07f2 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 14 Sep 2013 10:16:38 +1000
 Subject: [PATCH] Update Inventory and Health for PlayerConsumeItemEvent

CraftBukkit-Patches/0042-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch

@@ -1,4 +1,4 @@
-From 77f83517725bbe81f918b968045d2f319a7fea82 Mon Sep 17 00:00:00 2001
+From 4484ead55ca15520ed98646d5318a0a93c5d6608 Mon Sep 17 00:00:00 2001
 From: BlackHole <black-hole@live.com>
 Date: Tue, 16 Jul 2013 22:34:50 +0200
 Subject: [PATCH] Call EntityChangeBlockEvent for Fire Arrows hitting TNT

CraftBukkit-Patches/0043-Allow-Disabling-of-1.6.3-Structure-Saving.patch

@@ -1,4 +1,4 @@
-From fba2b9c4d38742aa9cd7402ffb3b050f2c687d4c Mon Sep 17 00:00:00 2001
+From 7bc859e1e7ba2ac758032adca239c0c242e10e17 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 21 Sep 2013 12:33:09 +1000
 Subject: [PATCH] Allow Disabling of 1.6.3 Structure Saving

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

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

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

@@ -1,11 +1,11 @@
-From 51b6f158ded3214ccf521aab307d58fac43d68e2 Mon Sep 17 00:00:00 2001
+From 6fcad7b2870b2d5b68447118b2cf7da3249bf619 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 65dd171..96e025d 100644
+index bd92555..6952925 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -108,6 +108,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList

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

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

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

@@ -1,11 +1,11 @@
-From 6acacd657fbcbee0901193bea246574f1d7df832 Mon Sep 17 00:00:00 2001
+From 148f29b493844ff55a6a7f4f0e5da6755304aa14 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 ae00f60..7d1727d 100644
+index 6e5450a..ead7eef 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -155,7 +155,7 @@ public class EntityArrow extends Entity implements IProjectile {

CraftBukkit-Patches/0048-Fix-packed-ice-generation.patch

@@ -1,4 +1,4 @@
-From 3c2acf7e6e966f13040c69a1d3e0df1d05a7047b Mon Sep 17 00:00:00 2001
+From 0d139f05cb2212ed495f4fa6e8ede867c71a8cb0 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 1 Dec 2013 17:52:14 +1100
 Subject: [PATCH] Fix packed ice generation

CraftBukkit-Patches/0049-Watchdog-Thread.patch

@@ -1,4 +1,4 @@
-From 67c65beda7c31aacc7459cc4d57f663d5d06a096 Mon Sep 17 00:00:00 2001
+From b1a40798e24f77ea7ba865a0443fbc5acac3ab3f 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.

CraftBukkit-Patches/0050-Clear-Flower-Pot-on-Drop.patch

@@ -1,4 +1,4 @@
-From a956b3663faf45c0a04f66f7fdc3ca238eab76c3 Mon Sep 17 00:00:00 2001
+From 0af3275ff3ea1e41a07a5d22f36f311eb356c7e8 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 3 Dec 2013 11:07:48 +1100
 Subject: [PATCH] Clear Flower Pot on Drop

CraftBukkit-Patches/0051-Fix-some-chunks-not-being-sent-to-the-client.patch

@@ -1,4 +1,4 @@
-From 32611dcf3944f116ddebd3dd2dafb1c9ca15825e Mon Sep 17 00:00:00 2001
+From e6a26962f638237151ab2f0199b1143fb11b7a85 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Mon, 2 Dec 2013 23:42:09 +0000
 Subject: [PATCH] Fix some chunks not being sent to the client

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

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

CraftBukkit-Patches/0053-Orebfuscator.patch

@@ -1,4 +1,4 @@
-From 8abc761a307c8805fc52e91e6fdaf284059f4d23 Mon Sep 17 00:00:00 2001
+From 8b4bf455ad97f5e8945d8ffc23270728c028bae8 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 16 May 2013 18:51:05 +1000
 Subject: [PATCH] Orebfuscator
@@ -79,7 +79,7 @@ index 8af5e1f..9df0d53 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index 5e7545a..a13610e 100644
+index b2431d9..7b469e1 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -197,6 +197,7 @@ public class PlayerInteractManager {
@@ -91,7 +91,7 @@ index 5e7545a..a13610e 100644
  
      public void a(BlockPosition blockposition) {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 16198c9..eac5e3c 100644
+index dad3d19..f6b1dac 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -460,6 +460,7 @@ public abstract class World implements IBlockAccess {

CraftBukkit-Patches/0054-Optimize-DataWatcher.patch

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

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

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

CraftBukkit-Patches/0056-BungeeCord-Support.patch

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

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

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

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

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

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

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

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

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

CraftBukkit-Patches/0061-Particle-API.patch

@@ -1,4 +1,4 @@
-From 71ef235ee356c1c2074c85720447540de1e368b4 Mon Sep 17 00:00:00 2001
+From 37586b4524ce86035912e75dff6a03f252012546 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

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

@@ -1,11 +1,11 @@
-From b1463976068e165707ff3fe644b0b712f907fea7 Mon Sep 17 00:00:00 2001
+From d9000b63f364959a253f852d5903d5ff23f0a677 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 ad48ca8..4bf6713 100644
+index bcb815c..19626f6 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1198,6 +1198,7 @@ public abstract class Entity implements ICommandListener {

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

@@ -1,11 +1,11 @@
-From 11b56bc54102b09da6713360b917e944b4d177ea Mon Sep 17 00:00:00 2001
+From 2abf3a28df8ca9124f12eb706d379b09e43337e3 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 11 Jun 2013 12:17:37 +1000
 Subject: [PATCH] More Efficient GetCubes
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index eac5e3c..a0a1790 100644
+index f6b1dac..248f485 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1052,33 +1052,60 @@ public abstract class World implements IBlockAccess {

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

@@ -1,11 +1,11 @@
-From 60d8cef46666b7df46b5b4c60007851b4150551f Mon Sep 17 00:00:00 2001
+From 292d5e95ddec8b748b5a5803529045da7d86fa96 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 2 Feb 2014 16:55:46 +0000
 Subject: [PATCH] Add Option to Nerf Mobs from Spawner's
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 4bf6713..8537222 100644
+index 19626f6..f96a153 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -118,6 +118,7 @@ public abstract class Entity implements ICommandListener {
@@ -17,7 +17,7 @@ index 4bf6713..8537222 100644
      // Spigot end
  
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index a8801f1..02eed74 100644
+index f387687..5ef61d9 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -450,6 +450,12 @@ public abstract class EntityInsentient extends EntityLiving {

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-From d57e434364dc3456966f6837c2bf0258170d3613 Mon Sep 17 00:00:00 2001
+From 687b9034da295f5f73a587e926cea6bdbae5a14b Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 10 Jan 2014 15:15:50 +1100
 Subject: [PATCH] Fix ItemStack Unbreakable Code

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

@@ -1,4 +1,4 @@
-From 37111d2adbf8e163fbc5468dce5bc02ddf74d58c Mon Sep 17 00:00:00 2001
+From 38335859827f906d56c01a393617dd0c7657ef2c Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 12 Jan 2014 20:56:41 +1100
 Subject: [PATCH] Try and Debug Crash Reports Crashing

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

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