Move version resolve check to initial POM patch

CraftBukkit-Patches/0001-POM-Changes.patch

@@ -1,4 +1,4 @@
-From 6dd764bae1ebff787bcd16c1b055333995c80dbc Mon Sep 17 00:00:00 2001
+From 2f15ef604aa43522676d3a290e8fcdc8357e9a49 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 3 Feb 2013 09:44:24 +1100
 Subject: [PATCH] POM Changes.
@@ -116,6 +116,19 @@ index 9ff95c6..da1a0eb 100644
          <executions>
            <execution>
              <phase>package</phase>
+diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
+index f905d17..9304637 100644
+--- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
++++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
+@@ -11,7 +11,7 @@ public final class Versioning {
+     public static String getBukkitVersion() {
+         String result = "Unknown-Version";
+ 
+-        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/org.bukkit/bukkit/pom.properties");
++        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/org.spigotmc/spigot-api/pom.properties");
+         Properties properties = new Properties();
+ 
+         if (stream != null) {
 -- 
 1.8.2.1
 

CraftBukkit-Patches/0011-Optimize-packet-used-to-unload-chunks-for-the-client.patch

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

CraftBukkit-Patches/0011-Update-versioning-check-to-correctly-resolve-api-ver.patch

@@ -1,22 +0,0 @@
-From 7866a2f38c32cab403554e122670e7c44b97dd14 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/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-index f905d17..9304637 100644
---- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-@@ -11,7 +11,7 @@ public final class Versioning {
-     public static String getBukkitVersion() {
-         String result = "Unknown-Version";
- 
--        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/org.bukkit/bukkit/pom.properties");
-+        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/org.spigotmc/spigot-api/pom.properties");
-         Properties properties = new Properties();
- 
-         if (stream != null) {
--- 
-1.8.2.1
-

CraftBukkit-Patches/0012-Alternate-sync-free-but-safe-chunk-reference-cache.patch

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

CraftBukkit-Patches/0013-Tick-loop-optimization-sleep-for-as-long-as-possible.patch

@@ -1,4 +1,4 @@
-From 4414321e46640b3a33eb118b48589bc2eadd1c56 Mon Sep 17 00:00:00 2001
+From fb71acadb1e590cf6759067258e5f9da22675cf8 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 3 Feb 2013 12:28:17 +1100
 Subject: [PATCH] Tick loop optimization - sleep for as long as possible.

CraftBukkit-Patches/0014-Improved-Timings-System.patch

@@ -1,4 +1,4 @@
-From 043b7b77e70022138dcdbaefbd09238b74423fd5 Mon Sep 17 00:00:00 2001
+From 82d081b636d0a51ea6773b49f665863444d9fe52 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 10 Jan 2013 00:18:11 -0500
 Subject: [PATCH] Improved Timings System

CraftBukkit-Patches/0015-Add-oreobfuscator-for-Spigot.patch

@@ -1,4 +1,4 @@
-From bd36fd8224840874eee255240a95d5838d910737 Mon Sep 17 00:00:00 2001
+From 438a941956c79e8a33f240b32cba493dee72ef2d Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 10:58:17 +1100
 Subject: [PATCH] Add oreobfuscator for Spigot.

CraftBukkit-Patches/0016-Only-count-entities-in-chunks-being-processed-for-th.patch

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

CraftBukkit-Patches/0017-Detect-remove-and-warn-about-null-tile-entities.patch

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

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

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

CraftBukkit-Patches/0019-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch

@@ -1,4 +1,4 @@
-From 8a10704aa2e70c5d9d461c892a930dd3ddd6320e Mon Sep 17 00:00:00 2001
+From b34586f9690cc7869fc54917df30d3a0413beff8 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. Rewrite the Metrics system to be closer to the

CraftBukkit-Patches/0020-Watchdog-Thread.patch

@@ -1,4 +1,4 @@
-From cc9da81376725d3f41e4b9d7bbdc3147130573d7 Mon Sep 17 00:00:00 2001
+From b23a6f7978ef79948ab15b9126d199df6e5c2865 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Feb 2013 12:33:20 +1100
 Subject: [PATCH] Watchdog Thread.

CraftBukkit-Patches/0021-Netty.patch

@@ -1,4 +1,4 @@
-From 937cd2af62e9aba06ca928808b954a967b39e70b Mon Sep 17 00:00:00 2001
+From ae36f22f9f3befe76565e9488da1ed48fe93987a Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 19 Apr 2013 17:44:39 +1000
 Subject: [PATCH] Netty

CraftBukkit-Patches/0022-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch

@@ -1,4 +1,4 @@
-From 03871ddf1b79ab43caa4794c84db09148d02250f Mon Sep 17 00:00:00 2001
+From 03988d5e8c3377bf241a8160c1845bbdb9ae0502 Mon Sep 17 00:00:00 2001
 From: EdGruberman <ed@rjump.com>
 Date: Fri, 22 Feb 2013 09:23:51 -0700
 Subject: [PATCH] Return bed location itself instead of next to bed; Fixes

CraftBukkit-Patches/0023-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch

@@ -1,4 +1,4 @@
-From 61fea458560bf9212ba6e67385ff7988972c04c4 Mon Sep 17 00:00:00 2001
+From 1d22c36f1f307d7ea7888e4dd20a4529363f95db Mon Sep 17 00:00:00 2001
 From: EdGruberman <ed@rjump.com>
 Date: Tue, 12 Feb 2013 16:17:31 -0700
 Subject: [PATCH] Remove dependency on CraftPlayer.getBedSpawnLocation; Fixes

CraftBukkit-Patches/0024-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch

@@ -1,4 +1,4 @@
-From 1ca8c2db44c9b9dd34db2ac5f36dfaf894b2e0d2 Mon Sep 17 00:00:00 2001
+From afee99028e8ff63527b84091ede331283abc7ef4 Mon Sep 17 00:00:00 2001
 From: Yariv Livay <yarivlivay@gmail.com>
 Date: Sat, 2 Mar 2013 09:36:52 +1100
 Subject: [PATCH] BUKKIT-3661, fixed missing HangingBreakEvent when

CraftBukkit-Patches/0025-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch

@@ -1,4 +1,4 @@
-From 50f01906623941eca95bf53adbb7e38de68fbd76 Mon Sep 17 00:00:00 2001
+From 0c7dc7ea5b5965a3cff0317bf90deba48227b61e Mon Sep 17 00:00:00 2001
 From: Yariv Livay <yarivlivay@gmail.com>
 Date: Mon, 25 Feb 2013 22:26:36 +0200
 Subject: [PATCH] Adds BUKKIT-3667, Faux sleepers wake up normally

CraftBukkit-Patches/0026-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch

@@ -1,4 +1,4 @@
-From 963f766cb076e6a8983faaa3a14124369bb5cec7 Mon Sep 17 00:00:00 2001
+From 525421dbffa6016d81331c6c9a1a15be02917865 Mon Sep 17 00:00:00 2001
 From: Yariv Livay <yarivlivay@gmail.com>
 Date: Tue, 26 Feb 2013 20:14:34 +0200
 Subject: [PATCH] BUKKIT-3668 Fix wrong block in BlockDispenseEvent when

CraftBukkit-Patches/0027-PlayerItemDamageEvent.patch

@@ -1,4 +1,4 @@
-From 069d3b19905fa584a623b36024b5cedadab38718 Mon Sep 17 00:00:00 2001
+From 3078ae0eef8f68ae05ebc2107746ccf6965713cf 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/0028-Faster-UUID-for-entities.patch

@@ -1,4 +1,4 @@
-From 2b65267bd33de765abe59d7c47e6e7431eea888c Mon Sep 17 00:00:00 2001
+From 90ba774bcafa370b5cd082f0d4aa8a7d717dae1e Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 17 Mar 2013 19:02:50 +1100
 Subject: [PATCH] Faster UUID for entities

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

@@ -1,4 +1,4 @@
-From 856c80c7445ba24d8b55291fa8f7c9dae9dec58b Mon Sep 17 00:00:00 2001
+From bb19263eed54f52fe0b0dd8d8bff649073016fff 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/0030-Stage-DataWatcher-WatchableObject.patch

@@ -1,4 +1,4 @@
-From 529c96426506d0211e28f6251ddfc705392936fe Mon Sep 17 00:00:00 2001
+From ea0a53558ac6f173d2dae99e1152e8a09b4c083b Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 21 Mar 2013 17:00:54 +1100
 Subject: [PATCH] Stage DataWatcher & WatchableObject.

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

@@ -1,4 +1,4 @@
-From 603cd06ab23bd22aaec57f52cafdb62757f528b9 Mon Sep 17 00:00:00 2001
+From 15fc2a6fa3f0ed848e928ff0da1f3a31edaed0c5 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/0032-BungeeCord-Support.patch

@@ -1,4 +1,4 @@
-From 64db4568e3569988cd08a4e671a05f98b59763a9 Mon Sep 17 00:00:00 2001
+From 54be87d488966a3576c47be9ac175ece46909e8e Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 11:15:11 +1100
 Subject: [PATCH] BungeeCord Support

CraftBukkit-Patches/0033-Texture-Pack-Resolutions.patch

@@ -1,4 +1,4 @@
-From 37ac86f0ff79bbfac1afc367b4e99ba681915ff3 Mon Sep 17 00:00:00 2001
+From f3d344a14e5c28ede7d04415149d8277344e5e66 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 13:04:45 +1100
 Subject: [PATCH] Texture Pack Resolutions

CraftBukkit-Patches/0034-Limit-Custom-Map-Rendering.patch

@@ -1,4 +1,4 @@
-From 7a602b1febd624f603ac40391b3f4d8126f09134 Mon Sep 17 00:00:00 2001
+From 0c5d5c8f8863549c7b36e7d557a76889765f5961 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 19:08:41 +1100
 Subject: [PATCH] Limit Custom Map Rendering

CraftBukkit-Patches/0035-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch

@@ -1,4 +1,4 @@
-From 2b34f5139b1dbb3c389a3eb525bc83124e911985 Mon Sep 17 00:00:00 2001
+From 4a583d6032b6063f3dccca708faafd27bc0000fb Mon Sep 17 00:00:00 2001
 From: Hudson <hudson@mydomain.com>
 Date: Wed, 3 Apr 2013 02:16:56 -0500
 Subject: [PATCH] Revert "Throw exception for disabled plugin tasks. Fixes

CraftBukkit-Patches/0036-InventoryClickEvent-now-can-return-if-the-click-was-.patch

@@ -1,4 +1,4 @@
-From abac44df8b621da4a7cbb7fbbbebd6a48918a782 Mon Sep 17 00:00:00 2001
+From b14ef0d35041dd0711f8da12b7bc82c544ae1ec9 Mon Sep 17 00:00:00 2001
 From: Tyler Blair <hidendra@griefcraft.com>
 Date: Tue, 9 Apr 2013 17:55:15 -0300
 Subject: [PATCH] InventoryClickEvent now can return if the click was a double

CraftBukkit-Patches/0037-Enable-Improved-ping-sending.patch

@@ -1,4 +1,4 @@
-From bd5f552eae7391d9c4798d270821d29e337c8e4d Mon Sep 17 00:00:00 2001
+From 3c78de6884305234b68a65f73680907263b66413 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Feb 2013 20:45:20 +1100
 Subject: [PATCH] Enable Improved ping sending

CraftBukkit-Patches/0038-Prevent-handshake-spam-from-invalid-names.patch

@@ -1,4 +1,4 @@
-From c3e72db478ea4e2b69bee03318be189cb7bc257b Mon Sep 17 00:00:00 2001
+From 54aa49bd3dccd1b9b209cbd4f81b08208d586b3a Mon Sep 17 00:00:00 2001
 From: Benjamin James Harrison-Sims <tehrainbowguy@gmail.com>
 Date: Sun, 14 Apr 2013 21:19:57 +0500
 Subject: [PATCH] Prevent handshake spam from invalid names.

CraftBukkit-Patches/0039-Snapshot-Protocol.patch

@@ -1,4 +1,4 @@
-From d504f3069c822a67043c68e27a56a1bdff559266 Mon Sep 17 00:00:00 2001
+From 7a6aea043ba36689910286ee7fbb3dff03766bf9 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 19 Apr 2013 19:13:42 +1000
 Subject: [PATCH] Snapshot Protocol

CraftBukkit-Patches/0040-Save-entity-counts-for-randomly-spawned-creatures-to.patch

@@ -1,4 +1,4 @@
-From 093324f22d92096d4d3e22509a6fef21f47343c8 Mon Sep 17 00:00:00 2001
+From 13861d6edb0b265eb0fe878e06c420495dbd7b53 Mon Sep 17 00:00:00 2001
 From: Ammar Askar <ammar@ammaraskar.com>
 Date: Sat, 20 Apr 2013 12:26:20 +0500
 Subject: [PATCH] Save entity counts for randomly spawned creatures to avoid