From 49115972320018fd295adf84adca2aef6f4ddc91 Mon Sep 17 00:00:00 2001
From: Spigot <noreply+git-spigot@papermc.io>
Date: Sun, 3 Feb 2013 09:38:54 +1100
Subject: [PATCH] Update POM changes to individual patches.

By: md_5 <md_5@live.com.au>
---
 Bukkit-Patches/0001-Spigot-POM-Changes.patch  |  44 +++----
 CraftBukkit-Patches/0001-POM-Changes.patch    | 110 ++++++++++++++++++
 ...hanges.patch => 0002-Spigot-changes.patch} |  41 +------
 ...de-Plugin-to-version-2.0.-Fixes-BUKK.patch |  25 ----
 ...Update-pom-with-Spigot-specific-info.patch |  73 ------------
 ...-check-to-correctly-resolve-api-ver.patch} |   2 +-
 ...sed-to-unload-chunks-for-the-client.patch} |   2 +-
 ....move-if-we-are-not-moving-anywhere.patch} |   4 +-
 ...free-but-safe-chunk-reference-cache.patch} |   2 +-
 ...dd-Custom-Timings-to-various-points.patch} |   2 +-
 ...ter-more-flexible-itemstack-merging.patch} |   2 +-
 ...> 0019-Add-oreobfuscator-for-Spigot.patch} |   2 +-
 ...er-of-LivingEntity-collision-checks.patch} |   2 +-
 ...gs.patch => 0021-Track-Xray-timings.patch} |   2 +-
 ...es-in-chunks-being-processed-for-th.patch} |   2 +-
 ...ess-often-to-combat-the-lag-they-ca.patch} |   2 +-
 ...e-and-warn-about-null-tile-entities.patch} |   2 +-
 17 files changed, 148 insertions(+), 171 deletions(-)
 create mode 100644 CraftBukkit-Patches/0001-POM-Changes.patch
 rename CraftBukkit-Patches/{0001-Spigot-changes.patch => 0002-Spigot-changes.patch} (98%)
 delete mode 100644 CraftBukkit-Patches/0002-Update-Maven-Shade-Plugin-to-version-2.0.-Fixes-BUKK.patch
 delete mode 100644 CraftBukkit-Patches/0013-Update-pom-with-Spigot-specific-info.patch
 rename CraftBukkit-Patches/{0014-Update-versioning-check-to-correctly-resolve-api-ver.patch => 0013-Update-versioning-check-to-correctly-resolve-api-ver.patch} (94%)
 rename CraftBukkit-Patches/{0015-Optimize-packet-used-to-unload-chunks-for-the-client.patch => 0014-Optimize-packet-used-to-unload-chunks-for-the-client.patch} (97%)
 rename CraftBukkit-Patches/{0016-Skip-entity.move-if-we-are-not-moving-anywhere.patch => 0015-Skip-entity.move-if-we-are-not-moving-anywhere.patch} (89%)
 rename CraftBukkit-Patches/{0017-Alternate-sync-free-but-safe-chunk-reference-cache.patch => 0016-Alternate-sync-free-but-safe-chunk-reference-cache.patch} (95%)
 rename CraftBukkit-Patches/{0018-Add-Custom-Timings-to-various-points.patch => 0017-Add-Custom-Timings-to-various-points.patch} (99%)
 rename CraftBukkit-Patches/{0019-Better-more-flexible-itemstack-merging.patch => 0018-Better-more-flexible-itemstack-merging.patch} (98%)
 rename CraftBukkit-Patches/{0020-Add-oreobfuscator-for-Spigot.patch => 0019-Add-oreobfuscator-for-Spigot.patch} (99%)
 rename CraftBukkit-Patches/{0021-Reduce-number-of-LivingEntity-collision-checks.patch => 0020-Reduce-number-of-LivingEntity-collision-checks.patch} (95%)
 rename CraftBukkit-Patches/{0022-Track-Xray-timings.patch => 0021-Track-Xray-timings.patch} (97%)
 rename CraftBukkit-Patches/{0023-Only-count-entities-in-chunks-being-processed-for-th.patch => 0022-Only-count-entities-in-chunks-being-processed-for-th.patch} (98%)
 rename CraftBukkit-Patches/{0024-Send-maps-a-lot-less-often-to-combat-the-lag-they-ca.patch => 0023-Send-maps-a-lot-less-often-to-combat-the-lag-they-ca.patch} (94%)
 rename CraftBukkit-Patches/{0025-Detect-remove-and-warn-about-null-tile-entities.patch => 0024-Detect-remove-and-warn-about-null-tile-entities.patch} (95%)

diff --git a/Bukkit-Patches/0001-Spigot-POM-Changes.patch b/Bukkit-Patches/0001-Spigot-POM-Changes.patch
index 5c2a423e69..e921a352f9 100644
--- a/Bukkit-Patches/0001-Spigot-POM-Changes.patch
+++ b/Bukkit-Patches/0001-Spigot-POM-Changes.patch
@@ -1,17 +1,17 @@
-From 8f85fec369bf49bbf9eb6b5418a7f584c9ad440b Mon Sep 17 00:00:00 2001
-From: md_5 <md_5@bigpond.com>
-Date: Sat, 5 Jan 2013 15:34:12 +1100
+From 1b48da0399fbc347ad1ccd1b2ed0d079247e9cde Mon Sep 17 00:00:00 2001
+From: md_5 <md_5@live.com.au>
+Date: Sun, 3 Feb 2013 09:32:19 +1100
 Subject: [PATCH] Spigot POM Changes
 
 ---
- pom.xml | 36 ++++--------------------------------
- 1 file changed, 4 insertions(+), 32 deletions(-)
+ pom.xml | 30 +++++++++---------------------
+ 1 file changed, 9 insertions(+), 21 deletions(-)
 
 diff --git a/pom.xml b/pom.xml
-index 18bda4b..b531cec 100644
+index 18bda4b..46b6157 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -1,43 +1,15 @@
+@@ -1,40 +1,28 @@
  <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
      <modelVersion>4.0.0</modelVersion>
 -    <groupId>org.bukkit</groupId>
@@ -34,31 +34,33 @@ index 18bda4b..b531cec 100644
 -        <url>https://github.com/Bukkit/Bukkit/tree/master/</url>
 -    </scm>
 -
--    <ciManagement>
--        <system>jenkins</system>
+     <ciManagement>
+         <system>jenkins</system>
 -        <url>http://ci.bukkit.org</url>
--    </ciManagement>
--
--    <distributionManagement>
++        <url>http://ci.md-5.net/job/Spigot-API</url>
+     </ciManagement>
+ 
+     <distributionManagement>
 -        <site>
 -            <id>jd.bukkit.org</id>
 -            <url>file:///home/javadocs/public_html/</url>
 -        </site>
--        <repository>
+         <repository>
 -            <id>repobo-rel</id>
 -            <name>repo.bukkit.org Releases</name>
 -            <url>http://repo.bukkit.org/content/repositories/releases/</url>
--        </repository>
--        <snapshotRepository>
++            <id>md_5-releases</id>
++            <url>http://repo.md-5.net/content/repositories/releases/</url>
+         </repository>
+         <snapshotRepository>
 -            <id>repobo-snap</id>
 -            <name>repo.bukkit.org Snapshots</name>
 -            <url>http://repo.bukkit.org/content/repositories/snapshots/</url>
--        </snapshotRepository>
--    </distributionManagement>
--
-     <build>
-         <plugins>
-             <plugin>
++            <id>md_5-snapshots</id>
++            <url>http://repo.md-5.net/content/repositories/snapshots/</url>
+         </snapshotRepository>
+     </distributionManagement>
+ 
 -- 
 1.8.1-rc2
 
diff --git a/CraftBukkit-Patches/0001-POM-Changes.patch b/CraftBukkit-Patches/0001-POM-Changes.patch
new file mode 100644
index 0000000000..a5aa59679a
--- /dev/null
+++ b/CraftBukkit-Patches/0001-POM-Changes.patch
@@ -0,0 +1,110 @@
+From 90c154d7287ae9c3480f31c4b0d56c33b7a1dba4 Mon Sep 17 00:00:00 2001
+From: md_5 <md_5@live.com.au>
+Date: Sun, 3 Feb 2013 09:37:03 +1100
+Subject: [PATCH] POM Changes.
+
+---
+ pom.xml | 43 +++++++++++++++++--------------------------
+ 1 file changed, 17 insertions(+), 26 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index d697ca1..5704b92 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -1,12 +1,12 @@
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+-  <groupId>org.bukkit</groupId>
+-  <artifactId>craftbukkit</artifactId>
++  <groupId>org.spigotmc</groupId>
++  <artifactId>spigot</artifactId>
+   <packaging>jar</packaging>
+   <version>1.4.7-R1.1-SNAPSHOT</version>
+-  <name>CraftBukkit</name>
+-  <url>http://www.bukkit.org</url>
++  <name>Spigot</name>
++  <url>http://www.spigotmc.org</url>
+ 
+   <properties>
+     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+@@ -16,22 +16,15 @@
+     <minecraft_version>1_4_R1</minecraft_version>
+   </properties>
+ 
+-  <scm>
+-    <connection>scm:git:git://github.com/Bukkit/CraftBukkit.git</connection>
+-    <developerConnection>scm:git:ssh://git@github.com/Bukkit/CraftBukkit.git</developerConnection>
+-    <url>https://github.com/Bukkit/CraftBukkit</url>
+-  </scm>
+ 
+   <distributionManagement>
+     <repository>
+-      <id>repobo-rel</id>
+-      <name>repo.bukkit.org Releases</name>
+-      <url>http://repo.bukkit.org/content/repositories/releases/</url>
++      <id>md_5-releases</id>
++      <url>http://repo.md-5.net/content/repositories/releases/</url>
+     </repository>
+     <snapshotRepository>
+-      <id>repobo-snap</id>
+-      <name>repo.bukkit.org Snapshots</name>
+-      <url>http://repo.bukkit.org/content/repositories/snapshots/</url>
++      <id>md_5-snapshots</id>
++      <url>http://repo.md-5.net/content/repositories/snapshots/</url>
+     </snapshotRepository>
+   </distributionManagement>
+ 
+@@ -42,17 +35,10 @@
+     </repository>
+   </repositories>
+ 
+-  <pluginRepositories>
+-    <pluginRepository>
+-      <id>bukkit-plugins</id>
+-      <url>http://repo.bukkit.org/content/groups/public</url>
+-    </pluginRepository>
+-  </pluginRepositories>
+-
+   <dependencies>
+     <dependency>
+-      <groupId>org.bukkit</groupId>
+-      <artifactId>bukkit</artifactId>
++      <groupId>org.spigotmc</groupId>
++      <artifactId>spigot-api</artifactId>
+       <version>${project.version}</version>
+       <type>jar</type>
+       <scope>compile</scope>
+@@ -145,6 +131,11 @@
+       <version>1.3</version>
+       <scope>test</scope>
+     </dependency>
++    <dependency>
++      <groupId>net.sf.trove4j</groupId>
++      <artifactId>trove4j</artifactId>
++      <version>3.0.2</version>
++    </dependency>
+   </dependencies>
+ 
+   <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
+@@ -156,7 +147,7 @@
+         <artifactId>gitdescribe-maven-plugin</artifactId>
+         <version>1.3</version>
+         <configuration>
+-          <outputPrefix>git-Bukkit-</outputPrefix>
++          <outputPrefix>git-Spigot-</outputPrefix>
+           <outputPostfix></outputPostfix>
+         </configuration>
+         <executions>
+@@ -210,7 +201,7 @@
+       <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+         <artifactId>maven-shade-plugin</artifactId>
+-        <version>1.4</version>
++        <version>2.0</version>
+         <executions>
+           <execution>
+             <phase>package</phase>
+-- 
+1.8.1-rc2
+
diff --git a/CraftBukkit-Patches/0001-Spigot-changes.patch b/CraftBukkit-Patches/0002-Spigot-changes.patch
similarity index 98%
rename from CraftBukkit-Patches/0001-Spigot-changes.patch
rename to CraftBukkit-Patches/0002-Spigot-changes.patch
index 03aaa7dfbc..a2477c62b8 100644
--- a/CraftBukkit-Patches/0001-Spigot-changes.patch
+++ b/CraftBukkit-Patches/0002-Spigot-changes.patch
@@ -1,11 +1,10 @@
-From 919d7607ccfee7e7949c5b289a05a73974b76546 Mon Sep 17 00:00:00 2001
+From 1fe7705634f785cb08d806d318a11cc762ad9c9a Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 2 Feb 2013 19:38:11 +1100
 Subject: [PATCH] Spigot changes.
 
 ---
  .gitignore                                         |   2 +
- pom.xml                                            |  11 +-
  src/main/java/net/minecraft/server/Block.java      |  12 +
  .../java/net/minecraft/server/BlockCactus.java     |   2 +-
  src/main/java/net/minecraft/server/BlockCrops.java |   2 +-
@@ -41,7 +40,7 @@ Subject: [PATCH] Spigot changes.
  .../org/bukkit/craftbukkit/util/TimedThread.java   |  37 ++
  .../bukkit/craftbukkit/util/WatchdogThread.java    |  88 ++++
  src/main/resources/configurations/bukkit.yml       |  30 ++
- 37 files changed, 1421 insertions(+), 134 deletions(-)
+ 36 files changed, 1413 insertions(+), 131 deletions(-)
  create mode 100644 src/main/java/org/bukkit/craftbukkit/Spigot.java
  create mode 100644 src/main/java/org/bukkit/craftbukkit/command/RestartCommand.java
  create mode 100644 src/main/java/org/bukkit/craftbukkit/command/TicksPerSecondCommand.java
@@ -63,42 +62,6 @@ index a689360..b97a549 100644
 +
 +/dependency-reduced-pom.xml
 \ No newline at end of file
-diff --git a/pom.xml b/pom.xml
-index d697ca1..b8d2ccb 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -51,8 +51,8 @@
- 
-   <dependencies>
-     <dependency>
--      <groupId>org.bukkit</groupId>
--      <artifactId>bukkit</artifactId>
-+      <groupId>org.spigotmc</groupId>
-+      <artifactId>spigot-api</artifactId>
-       <version>${project.version}</version>
-       <type>jar</type>
-       <scope>compile</scope>
-@@ -145,6 +145,11 @@
-       <version>1.3</version>
-       <scope>test</scope>
-     </dependency>
-+    <dependency>
-+      <groupId>net.sf.trove4j</groupId>
-+      <artifactId>trove4j</artifactId>
-+      <version>3.0.2</version>
-+    </dependency>
-   </dependencies>
- 
-   <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
-@@ -156,7 +161,7 @@
-         <artifactId>gitdescribe-maven-plugin</artifactId>
-         <version>1.3</version>
-         <configuration>
--          <outputPrefix>git-Bukkit-</outputPrefix>
-+          <outputPrefix>git-Spigot-</outputPrefix>
-           <outputPostfix></outputPostfix>
-         </configuration>
-         <executions>
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
 index f29eace..202bd19 100644
 --- a/src/main/java/net/minecraft/server/Block.java
diff --git a/CraftBukkit-Patches/0002-Update-Maven-Shade-Plugin-to-version-2.0.-Fixes-BUKK.patch b/CraftBukkit-Patches/0002-Update-Maven-Shade-Plugin-to-version-2.0.-Fixes-BUKK.patch
deleted file mode 100644
index be2c85fc3f..0000000000
--- a/CraftBukkit-Patches/0002-Update-Maven-Shade-Plugin-to-version-2.0.-Fixes-BUKK.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ad5f8460796c73c06af284870602c56ea509129b Mon Sep 17 00:00:00 2001
-From: Agaricus <agaricusb@yahoo.com>
-Date: Wed, 19 Dec 2012 19:13:17 -0800
-Subject: [PATCH] Update Maven Shade Plugin to version 2.0. Fixes BUKKIT-3213
-
----
- pom.xml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pom.xml b/pom.xml
-index bd394ae..a09a7c4 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -215,7 +215,7 @@
-       <plugin>
-         <groupId>org.apache.maven.plugins</groupId>
-         <artifactId>maven-shade-plugin</artifactId>
--        <version>1.4</version>
-+        <version>2.0</version>
-         <executions>
-           <execution>
-             <phase>package</phase>
--- 
-1.8.1-rc2
-
diff --git a/CraftBukkit-Patches/0013-Update-pom-with-Spigot-specific-info.patch b/CraftBukkit-Patches/0013-Update-pom-with-Spigot-specific-info.patch
deleted file mode 100644
index 840d599c12..0000000000
--- a/CraftBukkit-Patches/0013-Update-pom-with-Spigot-specific-info.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From bc8a4cf3a67ffba7b91944b2bce7aab2395e09cd Mon Sep 17 00:00:00 2001
-From: md_5 <md_5@bigpond.com>
-Date: Tue, 15 Jan 2013 11:48:54 +1100
-Subject: [PATCH] Update pom with Spigot specific info.
-
----
- pom.xml | 34 ++++------------------------------
- 1 file changed, 4 insertions(+), 30 deletions(-)
-
-diff --git a/pom.xml b/pom.xml
-index 636509a..5a1a5dd 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -1,12 +1,12 @@
- <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-   <modelVersion>4.0.0</modelVersion>
--  <groupId>org.bukkit</groupId>
--  <artifactId>craftbukkit</artifactId>
-+  <groupId>org.spigotmc</groupId>
-+  <artifactId>spigot</artifactId>
-   <packaging>jar</packaging>
-   <version>1.4.7-R1.1-SNAPSHOT</version>
--  <name>CraftBukkit</name>
--  <url>http://www.bukkit.org</url>
-+  <name>Spigot</name>
-+  <url>http://www.spigotmc.org</url>
- 
-   <properties>
-     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-@@ -16,25 +16,6 @@
-     <minecraft_version>1_4_R1</minecraft_version>
-   </properties>
- 
--  <scm>
--    <connection>scm:git:git://github.com/Bukkit/CraftBukkit.git</connection>
--    <developerConnection>scm:git:ssh://git@github.com/Bukkit/CraftBukkit.git</developerConnection>
--    <url>https://github.com/Bukkit/CraftBukkit</url>
--  </scm>
--
--  <distributionManagement>
--    <repository>
--      <id>repobo-rel</id>
--      <name>repo.bukkit.org Releases</name>
--      <url>http://repo.bukkit.org/content/repositories/releases/</url>
--    </repository>
--    <snapshotRepository>
--      <id>repobo-snap</id>
--      <name>repo.bukkit.org Snapshots</name>
--      <url>http://repo.bukkit.org/content/repositories/snapshots/</url>
--    </snapshotRepository>
--  </distributionManagement>
--
-   <repositories>
-     <repository>
-       <id>repobo-snap</id>
-@@ -42,13 +23,6 @@
-     </repository>
-   </repositories>
- 
--  <pluginRepositories>
--    <pluginRepository>
--      <id>bukkit-plugins</id>
--      <url>http://repo.bukkit.org/content/groups/public</url>
--    </pluginRepository>
--  </pluginRepositories>
--
-   <dependencies>
-     <dependency>
-       <groupId>org.spigotmc</groupId>
--- 
-1.8.1-rc2
-
diff --git a/CraftBukkit-Patches/0014-Update-versioning-check-to-correctly-resolve-api-ver.patch b/CraftBukkit-Patches/0013-Update-versioning-check-to-correctly-resolve-api-ver.patch
similarity index 94%
rename from CraftBukkit-Patches/0014-Update-versioning-check-to-correctly-resolve-api-ver.patch
rename to CraftBukkit-Patches/0013-Update-versioning-check-to-correctly-resolve-api-ver.patch
index 14e450dc88..fe51021b72 100644
--- a/CraftBukkit-Patches/0014-Update-versioning-check-to-correctly-resolve-api-ver.patch
+++ b/CraftBukkit-Patches/0013-Update-versioning-check-to-correctly-resolve-api-ver.patch
@@ -1,4 +1,4 @@
-From eb2fad1de55d855c05ec5c64610ddaa1f050951d Mon Sep 17 00:00:00 2001
+From e9aa88610fc3b464adc357a0b6bd435032e41a7d Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@bigpond.com>
 Date: Tue, 15 Jan 2013 15:05:02 +1100
 Subject: [PATCH] Update versioning check to correctly resolve api version.
diff --git a/CraftBukkit-Patches/0015-Optimize-packet-used-to-unload-chunks-for-the-client.patch b/CraftBukkit-Patches/0014-Optimize-packet-used-to-unload-chunks-for-the-client.patch
similarity index 97%
rename from CraftBukkit-Patches/0015-Optimize-packet-used-to-unload-chunks-for-the-client.patch
rename to CraftBukkit-Patches/0014-Optimize-packet-used-to-unload-chunks-for-the-client.patch
index a0a5aa1c88..2e4c3c0bbb 100644
--- a/CraftBukkit-Patches/0015-Optimize-packet-used-to-unload-chunks-for-the-client.patch
+++ b/CraftBukkit-Patches/0014-Optimize-packet-used-to-unload-chunks-for-the-client.patch
@@ -1,4 +1,4 @@
-From 2c5bbb8b0dca630b5035d88335f810d39d065eb6 Mon Sep 17 00:00:00 2001
+From c11561f896f9b4445894ad7e1c69505d1b567597 Mon Sep 17 00:00:00 2001
 From: Ammar Askar <ammar@ammaraskar.com>
 Date: Fri, 18 Jan 2013 16:20:01 +0500
 Subject: [PATCH] Optimize packet used to unload chunks for the client
diff --git a/CraftBukkit-Patches/0016-Skip-entity.move-if-we-are-not-moving-anywhere.patch b/CraftBukkit-Patches/0015-Skip-entity.move-if-we-are-not-moving-anywhere.patch
similarity index 89%
rename from CraftBukkit-Patches/0016-Skip-entity.move-if-we-are-not-moving-anywhere.patch
rename to CraftBukkit-Patches/0015-Skip-entity.move-if-we-are-not-moving-anywhere.patch
index a99dbd4e6b..ecb8c21695 100644
--- a/CraftBukkit-Patches/0016-Skip-entity.move-if-we-are-not-moving-anywhere.patch
+++ b/CraftBukkit-Patches/0015-Skip-entity.move-if-we-are-not-moving-anywhere.patch
@@ -1,4 +1,4 @@
-From 824fbe25325c37bae8a2667d7344b922bc73d086 Mon Sep 17 00:00:00 2001
+From 54137647a6488134d5268180e083f4ab05ae8215 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 19 Jan 2013 01:11:30 -0500
 Subject: [PATCH] Skip entity.move() if we are not moving anywhere.
@@ -8,7 +8,7 @@ Subject: [PATCH] Skip entity.move() if we are not moving anywhere.
  1 file changed, 1 insertion(+)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index dffa97f..066143c 100644
+index 26b7a1f..2340fad 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -423,6 +423,7 @@ public abstract class Entity {
diff --git a/CraftBukkit-Patches/0017-Alternate-sync-free-but-safe-chunk-reference-cache.patch b/CraftBukkit-Patches/0016-Alternate-sync-free-but-safe-chunk-reference-cache.patch
similarity index 95%
rename from CraftBukkit-Patches/0017-Alternate-sync-free-but-safe-chunk-reference-cache.patch
rename to CraftBukkit-Patches/0016-Alternate-sync-free-but-safe-chunk-reference-cache.patch
index f54b7c5051..ce2209a725 100644
--- a/CraftBukkit-Patches/0017-Alternate-sync-free-but-safe-chunk-reference-cache.patch
+++ b/CraftBukkit-Patches/0016-Alternate-sync-free-but-safe-chunk-reference-cache.patch
@@ -1,4 +1,4 @@
-From 3db9355f95b3286195da752818eed63e3312ec0c Mon Sep 17 00:00:00 2001
+From 040e9d8a5a8437a06bbd4531fc788144defd447d Mon Sep 17 00:00:00 2001
 From: Mike Primm <mike@primmhome.com>
 Date: Wed, 16 Jan 2013 15:27:22 -0600
 Subject: [PATCH] Alternate, sync-free-but-safe chunk reference cache
diff --git a/CraftBukkit-Patches/0018-Add-Custom-Timings-to-various-points.patch b/CraftBukkit-Patches/0017-Add-Custom-Timings-to-various-points.patch
similarity index 99%
rename from CraftBukkit-Patches/0018-Add-Custom-Timings-to-various-points.patch
rename to CraftBukkit-Patches/0017-Add-Custom-Timings-to-various-points.patch
index d7ff4bb783..c5ab891a43 100644
--- a/CraftBukkit-Patches/0018-Add-Custom-Timings-to-various-points.patch
+++ b/CraftBukkit-Patches/0017-Add-Custom-Timings-to-various-points.patch
@@ -1,4 +1,4 @@
-From 944da35dce1c28a62ac3b019ae791d2ce20b6648 Mon Sep 17 00:00:00 2001
+From 907247991e7afc81ee0d550d53450e8999422fa0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 10 Jan 2013 00:18:11 -0500
 Subject: [PATCH] Add Custom Timings to various points
diff --git a/CraftBukkit-Patches/0019-Better-more-flexible-itemstack-merging.patch b/CraftBukkit-Patches/0018-Better-more-flexible-itemstack-merging.patch
similarity index 98%
rename from CraftBukkit-Patches/0019-Better-more-flexible-itemstack-merging.patch
rename to CraftBukkit-Patches/0018-Better-more-flexible-itemstack-merging.patch
index 07b134091a..af2d8a3f77 100644
--- a/CraftBukkit-Patches/0019-Better-more-flexible-itemstack-merging.patch
+++ b/CraftBukkit-Patches/0018-Better-more-flexible-itemstack-merging.patch
@@ -1,4 +1,4 @@
-From 1bb40d4b3fc5159e7c8e07b826d2f2009bbcf4d8 Mon Sep 17 00:00:00 2001
+From cde68c3d5bc4581749a7cf6afbd91a8213a2e1d5 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 25 Jan 2013 18:24:54 +1100
 Subject: [PATCH] Better + more flexible itemstack merging
diff --git a/CraftBukkit-Patches/0020-Add-oreobfuscator-for-Spigot.patch b/CraftBukkit-Patches/0019-Add-oreobfuscator-for-Spigot.patch
similarity index 99%
rename from CraftBukkit-Patches/0020-Add-oreobfuscator-for-Spigot.patch
rename to CraftBukkit-Patches/0019-Add-oreobfuscator-for-Spigot.patch
index eecaf45846..49fb14ac23 100644
--- a/CraftBukkit-Patches/0020-Add-oreobfuscator-for-Spigot.patch
+++ b/CraftBukkit-Patches/0019-Add-oreobfuscator-for-Spigot.patch
@@ -1,4 +1,4 @@
-From 116b25dc302af3d7059ee7fc101a570d19362a5f Mon Sep 17 00:00:00 2001
+From 67d9e120661e24df65c422e743fc1358ae5c4386 Mon Sep 17 00:00:00 2001
 From: lishid <lishid@gmail.com>
 Date: Mon, 21 Jan 2013 16:59:04 +1100
 Subject: [PATCH] Add oreobfuscator for Spigot.
diff --git a/CraftBukkit-Patches/0021-Reduce-number-of-LivingEntity-collision-checks.patch b/CraftBukkit-Patches/0020-Reduce-number-of-LivingEntity-collision-checks.patch
similarity index 95%
rename from CraftBukkit-Patches/0021-Reduce-number-of-LivingEntity-collision-checks.patch
rename to CraftBukkit-Patches/0020-Reduce-number-of-LivingEntity-collision-checks.patch
index ad3cdadac5..e39a99e631 100644
--- a/CraftBukkit-Patches/0021-Reduce-number-of-LivingEntity-collision-checks.patch
+++ b/CraftBukkit-Patches/0020-Reduce-number-of-LivingEntity-collision-checks.patch
@@ -1,4 +1,4 @@
-From f40330caff1f37825408461fed04b25c91a3a87b Mon Sep 17 00:00:00 2001
+From 3a77832f283c73ab7a576ada6942ddd35ebe7178 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Jan 2013 19:31:14 -0500
 Subject: [PATCH] Reduce number of LivingEntity collision checks.
diff --git a/CraftBukkit-Patches/0022-Track-Xray-timings.patch b/CraftBukkit-Patches/0021-Track-Xray-timings.patch
similarity index 97%
rename from CraftBukkit-Patches/0022-Track-Xray-timings.patch
rename to CraftBukkit-Patches/0021-Track-Xray-timings.patch
index e593da6424..1b95f74a3a 100644
--- a/CraftBukkit-Patches/0022-Track-Xray-timings.patch
+++ b/CraftBukkit-Patches/0021-Track-Xray-timings.patch
@@ -1,4 +1,4 @@
-From b9f3f54e97394c1e2ebeea5add889e9445d073dc Mon Sep 17 00:00:00 2001
+From 7b9729d3f63896d55a46055572f2f03e5b47695e Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 25 Jan 2013 13:15:42 +1100
 Subject: [PATCH] Track Xray timings.
diff --git a/CraftBukkit-Patches/0023-Only-count-entities-in-chunks-being-processed-for-th.patch b/CraftBukkit-Patches/0022-Only-count-entities-in-chunks-being-processed-for-th.patch
similarity index 98%
rename from CraftBukkit-Patches/0023-Only-count-entities-in-chunks-being-processed-for-th.patch
rename to CraftBukkit-Patches/0022-Only-count-entities-in-chunks-being-processed-for-th.patch
index e1d631642a..c7ff956e95 100644
--- a/CraftBukkit-Patches/0023-Only-count-entities-in-chunks-being-processed-for-th.patch
+++ b/CraftBukkit-Patches/0022-Only-count-entities-in-chunks-being-processed-for-th.patch
@@ -1,4 +1,4 @@
-From d8769d05d16d7fcad69a736f4dcb241f037755be Mon Sep 17 00:00:00 2001
+From 300dbbfcdb5a9b8c49d7ac421fba28eb0ac22170 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 29 Jan 2013 13:25:53 -0500
 Subject: [PATCH] Only count entities in chunks being processed for the spawn
diff --git a/CraftBukkit-Patches/0024-Send-maps-a-lot-less-often-to-combat-the-lag-they-ca.patch b/CraftBukkit-Patches/0023-Send-maps-a-lot-less-often-to-combat-the-lag-they-ca.patch
similarity index 94%
rename from CraftBukkit-Patches/0024-Send-maps-a-lot-less-often-to-combat-the-lag-they-ca.patch
rename to CraftBukkit-Patches/0023-Send-maps-a-lot-less-often-to-combat-the-lag-they-ca.patch
index 75a45c2522..f68bb1798d 100644
--- a/CraftBukkit-Patches/0024-Send-maps-a-lot-less-often-to-combat-the-lag-they-ca.patch
+++ b/CraftBukkit-Patches/0023-Send-maps-a-lot-less-often-to-combat-the-lag-they-ca.patch
@@ -1,4 +1,4 @@
-From f3d2c0764c022bea6bee6591a0e376e1c047b35a Mon Sep 17 00:00:00 2001
+From 5b78d30d5cced3b497859b4b9e1e11fab458588b Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 2 Feb 2013 19:40:53 +1100
 Subject: [PATCH] Send maps a lot less often to combat the lag they cause.
diff --git a/CraftBukkit-Patches/0025-Detect-remove-and-warn-about-null-tile-entities.patch b/CraftBukkit-Patches/0024-Detect-remove-and-warn-about-null-tile-entities.patch
similarity index 95%
rename from CraftBukkit-Patches/0025-Detect-remove-and-warn-about-null-tile-entities.patch
rename to CraftBukkit-Patches/0024-Detect-remove-and-warn-about-null-tile-entities.patch
index dc890152ea..2b742218a7 100644
--- a/CraftBukkit-Patches/0025-Detect-remove-and-warn-about-null-tile-entities.patch
+++ b/CraftBukkit-Patches/0024-Detect-remove-and-warn-about-null-tile-entities.patch
@@ -1,4 +1,4 @@
-From 06871b0489590cbdd3dd4f9cdd9f02d5397c3e6e Mon Sep 17 00:00:00 2001
+From a308c6b519ecd2e93036e1a16948d30a3648dd1b 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] Detect, remove and warn about null tile entities.