Add base patch for Spigot config

CraftBukkit-Patches/0004-Spigot-Configuration.patch

@@ -0,0 +1,30 @@
+From d22f6b12f4bfca69832a5f9fd17be298fe5dcbe7 Mon Sep 17 00:00:00 2001
+From: md_5 <md_5@live.com.au>
+Date: Tue, 14 May 2013 12:06:27 +1000
+Subject: [PATCH] Spigot Configuration
+
+
+diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
+index 7261dc9..10ce69d 100644
+--- a/src/main/java/net/minecraft/server/DedicatedServer.java
++++ b/src/main/java/net/minecraft/server/DedicatedServer.java
+@@ -55,6 +55,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+ 
+         this.getLogger().info("Loading properties");
+         this.propertyManager = new PropertyManager(this.options, this.getLogger()); // CraftBukkit - CLI argument support
++        this.a((PlayerList) (new DedicatedPlayerList(this))); // Spigot - moved up from below
+         if (this.I()) {
+             this.d("127.0.0.1");
+         } else {
+@@ -103,7 +104,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+             return false;
+         }
+ 
+-        this.a((PlayerList) (new DedicatedPlayerList(this))); // CraftBukkit
++        // this.a((PlayerList) (new DedicatedPlayerList(this))); // CraftBukkit // Spigot - moved to top of method
+ 
+         if (!this.getOnlineMode()) {
+             this.getLogger().warning("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!");
+-- 
+1.8.2.1
+

CraftBukkit-Patches/0005-Proxy-IP-Filter.patch

@@ -1,4 +1,4 @@
-From dc11955b66495dc0dc88e9e1775ef3de1ed3c06e Mon Sep 17 00:00:00 2001
+From 442c50bdefd5d2e1ab02bec593da75eed557ea05 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 23 Apr 2013 11:22:07 +1000
 Subject: [PATCH] Proxy IP Filter

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

@@ -1,4 +1,4 @@
-From 5399bd4fdda73b55589eb48f69ee46ff3363c10d Mon Sep 17 00:00:00 2001
+From 8786751ea0257600e6c0cbd3be6e3a8ddb4b699b 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

CraftBukkit-Patches/0007-LongHash-Tweaks.patch

@@ -1,4 +1,4 @@
-From e452f4069bf9976655a2c6710d9b9cd28e2d016b Mon Sep 17 00:00:00 2001
+From 3f10525ca3a5e8c488a1a9bbfe9fde6f72780b46 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 09:29:43 +1100
 Subject: [PATCH] LongHash Tweaks.

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

@@ -1,4 +1,4 @@
-From becc64aca459c1337bc4499542847edd3921a542 Mon Sep 17 00:00:00 2001
+From e0329a8be1bde7ee5fb46501ff9e65bf93568e45 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 7 Mar 2013 20:12:46 +1100
 Subject: [PATCH] Async Operation Catching

CraftBukkit-Patches/0009-View-Distance.patch

@@ -1,4 +1,4 @@
-From dccf82f4ad3c6c477e07464c5f47e75e2cc73661 Mon Sep 17 00:00:00 2001
+From 2b94f7c77f07a6de7a567a234e562dd76198ec3b 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
@@ -19,7 +19,7 @@ index 0dfd190..c543bed 100644
          } else {
              this.e = i;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 0b7ac47..a25cbf3 100644
+index 8114910..3a321da 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -51,7 +51,7 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
@@ -32,7 +32,7 @@ index 0b7ac47..a25cbf3 100644
              this.entitiesById = new IntHashMap();
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index f5e63f8..7c48dad 100644
+index 9e7d8ab..44d1842 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -120,6 +120,9 @@ public class CraftWorld implements World {

CraftBukkit-Patches/0010-Implement-lightening-of-NibbleArrays-only-allocate-b.patch

@@ -1,4 +1,4 @@
-From 7040b62affceb63b6dd01382023f17fd136450aa Mon Sep 17 00:00:00 2001
+From b1011da0e288e3f61f8eadb6e6c15b9c859b81d9 Mon Sep 17 00:00:00 2001
 From: Mike Primm <mike@primmhome.com>
 Date: Sun, 13 Jan 2013 03:49:07 -0800
 Subject: [PATCH] Implement 'lightening' of NibbleArrays - only allocate

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

@@ -1,4 +1,4 @@
-From 9542a9f8645de176e39d33694e930872ee7a42d8 Mon Sep 17 00:00:00 2001
+From 5bb52be208f1e396596280ff658b8a6e91b33265 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize packet used to unload chunks for the client
 At the moment telling a client to unload a chunk involves calling the entire chunk from memory, deflating it and then sending it through the pipes even though the client ignores it and based on the bitmap simply unloads the chunk, and to add the cherry on top, this is done on the main server thread.
 
 diff --git a/src/main/java/net/minecraft/server/Packet51MapChunk.java b/src/main/java/net/minecraft/server/Packet51MapChunk.java
-index ee179be..b51d90c 100644
+index 3c3bdbf..d11c0ea 100644
 --- a/src/main/java/net/minecraft/server/Packet51MapChunk.java
 +++ b/src/main/java/net/minecraft/server/Packet51MapChunk.java
 @@ -18,11 +18,24 @@ public class Packet51MapChunk extends Packet {

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

@@ -1,11 +1,11 @@
-From 6591b85a8d8dba678747feafc3e0bcec83bd6979 Mon Sep 17 00:00:00 2001
+From 09c0afb41d80f2474769b7360582e83b459923ba 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/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index af85d8b..eb03aba 100644
+index 3f9c453..6d59bc3 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -293,15 +293,13 @@ public abstract class World implements IBlockAccess {

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

@@ -1,4 +1,4 @@
-From 80157a1f1af5e8dbdc7c3b10e355e1048970cea5 Mon Sep 17 00:00:00 2001
+From 33632725e31f17845bf9b111ef3a500aa3ace5f3 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 2618c34301c92122133a456f41ce4649bb552f0f Mon Sep 17 00:00:00 2001
+From df973d43d513df224bd4b4f0c44107eff74c299f 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 1155f9606b7e8061b1ab5c19910133f7a0b40192 Mon Sep 17 00:00:00 2001
+From 8639462ceb382a8d29919d16524a1c8c22ceaf10 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.
@@ -17,7 +17,7 @@ index 17d837d..ecc52b9 100644
  
                  if (this.onGround) {
 diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
-index b43953a..b907562 100644
+index ef220c1..63f43b8 100644
 --- a/src/main/java/net/minecraft/server/Explosion.java
 +++ b/src/main/java/net/minecraft/server/Explosion.java
 @@ -240,6 +240,7 @@ public class Explosion {
@@ -29,7 +29,7 @@ index b43953a..b907562 100644
                      double d0 = (double) ((float) i + this.world.random.nextFloat());
                      double d1 = (double) ((float) j + this.world.random.nextFloat());
 diff --git a/src/main/java/net/minecraft/server/Packet51MapChunk.java b/src/main/java/net/minecraft/server/Packet51MapChunk.java
-index b51d90c..84dbb88 100644
+index d11c0ea..2fcd7f7 100644
 --- a/src/main/java/net/minecraft/server/Packet51MapChunk.java
 +++ b/src/main/java/net/minecraft/server/Packet51MapChunk.java
 @@ -36,7 +36,7 @@ public class Packet51MapChunk extends Packet {
@@ -134,7 +134,7 @@ index 20f8e8a..3792638 100644
                      for (k = 0; k < 16; ++k) {
                          if ((this.f & 1 << k) != 0) {
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index d03174b..354d4f6 100644
+index 1243d1d..1a31112 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -285,6 +285,11 @@ public class PlayerInteractManager {
@@ -150,7 +150,7 @@ index d03174b..354d4f6 100644
  
          if (false) { // Never trigger
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e5ceed1..20d38b4 100644
+index 12c5f81..767f3c3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -163,6 +163,13 @@ public final class CraftServer implements Server {
@@ -168,7 +168,7 @@ index e5ceed1..20d38b4 100644
          private boolean value = true;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 7c48dad..77078a1 100644
+index 44d1842..7d05a77 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -123,6 +123,8 @@ public class CraftWorld implements World {
@@ -197,7 +197,7 @@ index 7c48dad..77078a1 100644
      public int wheatGrowthModifier = 100;
      public int cactusGrowthModifier = 100;
 diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java
-index b64a7ca..58361fa 100644
+index 67477f4..c4eea4d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Spigot.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java
 @@ -19,6 +19,15 @@ public class Spigot {

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

@@ -1,4 +1,4 @@
-From bfbd9c222d0c5d8169ea3545e05c318e42835dd3 Mon Sep 17 00:00:00 2001
+From 01f20660e4bc91998c091310746eb05d1d0fe782 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Only count entities in chunks being processed for the spawn
 
 
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index b3e2818..6362a37 100644
+index 056100f..3529074 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -16,6 +16,7 @@ public final class SpawnerCreature {

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

@@ -1,11 +1,11 @@
-From 640e63f7708ad09e2a48f86cbd94692d5bd12094 Mon Sep 17 00:00:00 2001
+From 9318443175872f9a1c21c351148b052778625c54 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.
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 1bed9ed..51816e4 100644
+index feb657b..c547ecc 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1333,6 +1333,13 @@ public abstract class World implements IBlockAccess {

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

@@ -1,4 +1,4 @@
-From 33f534343e67d6e7e74240de7573806f35a1c160 Mon Sep 17 00:00:00 2001
+From 4bc75aa65c4aaa26d5158594602168b2cfd62875 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 c5c660bfcf54efd713bb1bb241cc1acdb294e126 Mon Sep 17 00:00:00 2001
+From c4c47af95920411ffd43ca773f3aa76b7a797f6b 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Metrics. Rewrite the Metrics system to be closer to the
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java
-index 61cd44d..88c2383 100644
+index 3e4a0a9..c81503e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Spigot.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java
 @@ -1,8 +1,10 @@

CraftBukkit-Patches/0020-Watchdog-Thread.patch

@@ -1,4 +1,4 @@
-From 3b9b44f5c52fab6917df74a9a5408ca93e3ba9e9 Mon Sep 17 00:00:00 2001
+From 306989a61052788166338af01c3953558549bc23 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 08b0653201cd272203727057469a8bf0f842c0f2 Mon Sep 17 00:00:00 2001
+From 674cdb53ac5d08828c63aad1abd6b1a2f37fb9e6 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 23 Apr 2013 11:47:32 +1000
 Subject: [PATCH] Netty
@@ -48,15 +48,11 @@ index 274fd43..b0891ff 100644
  
    <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 7261dc9..097be65 100644
+index 10ce69d..e4f1cbe 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
-@@ -92,10 +92,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -96,7 +96,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
- 
+         this.getLogger().info("Starting Minecraft server on " + (this.getServerIp().length() == 0 ? "*" : this.getServerIp()) + ":" + this.G());
-         this.getLogger().info("Generating keypair");
-         this.a(MinecraftEncryption.b());
--        this.getLogger().info("Starting Minecraft server on " + (this.getServerIp().length() == 0 ? "*" : this.getServerIp()) + ":" + this.G());
-+        this.a((PlayerList) (new DedicatedPlayerList(this))); // CraftBukkit
  
          try {
 -            this.r = new DedicatedServerConnection(this, inetaddress, this.G());
@@ -64,15 +60,6 @@ index 7261dc9..097be65 100644
          } catch (Throwable ioexception) { // CraftBukkit - IOException -> Throwable
              this.getLogger().warning("**** FAILED TO BIND TO PORT!");
              this.getLogger().warning("The exception was: {0}", new Object[] { ioexception.toString()});
-@@ -103,8 +103,6 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
-             return false;
-         }
- 
--        this.a((PlayerList) (new DedicatedPlayerList(this))); // CraftBukkit
--
-         if (!this.getOnlineMode()) {
-             this.getLogger().warning("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!");
-             this.getLogger().warning("The server will make no attempt to authenticate usernames. Beware.");
 diff --git a/src/main/java/net/minecraft/server/DedicatedServerConnectionThread.java b/src/main/java/net/minecraft/server/DedicatedServerConnectionThread.java
 index ef7e10d..5f2e42e 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServerConnectionThread.java

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

@@ -1,4 +1,4 @@
-From 6ba8ff41998d09eba7c4ae798d27c21ff1fd5762 Mon Sep 17 00:00:00 2001
+From 5a59a9e0be3ca5e595a225cafb14dc161ad49840 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 11b3b6b9add95dce5e0cbf9073b3bdd6bf04dd86 Mon Sep 17 00:00:00 2001
+From 34556739aa826604755ba587d45c4a9c7270ee5d 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 bfca37c383ed00f8bd8bc0bc7d6ef8cbb88a8956 Mon Sep 17 00:00:00 2001
+From d179b3bdf151369ac89b30a7b80159fa5e0cd0cf 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 e22ea3833c0e389a95337ca3ece31fc2c86a1638 Mon Sep 17 00:00:00 2001
+From 7240644f227e09211adc0528dc79434d1496b80e 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-PlayerItemDamageEvent.patch

@@ -1,4 +1,4 @@
-From ef7bf26d03fd9935ed9c20fb92c4b7c914289c2b Mon Sep 17 00:00:00 2001
+From 587f66f4c3618911fb8b7f35fb8c0fa9faea2492 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/0027-Faster-UUID-for-entities.patch

@@ -1,4 +1,4 @@
-From 2bfdd388dbc9e19dfc44ff035965f8a6c8dc9c44 Mon Sep 17 00:00:00 2001
+From bb5d2f99affb43f22ef7f16560ad6d6f7769fb33 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/0028-Prevent-NPE-in-CraftSign.patch

@@ -1,4 +1,4 @@
-From 197f9a0e30e92fa4ab306414b9e8b974b70e6041 Mon Sep 17 00:00:00 2001
+From 84eb369fce9dc020887e0a12a34cfcc4d60792ff 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/0029-Stage-DataWatcher-WatchableObject.patch

@@ -1,4 +1,4 @@
-From 3b20c4c199e2c820818d87f31749077060e9e821 Mon Sep 17 00:00:00 2001
+From f42cdf26ec5cb3f6e2b779d1a528b4ee4c33b0e5 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/0030-Entity-Tracking-Ranges.patch

@@ -1,4 +1,4 @@
-From a954ac7cda5864b927a45fd250d9e4f13b496bf6 Mon Sep 17 00:00:00 2001
+From ec57dc372930d4f73afd8236067f957b072047c3 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/0031-BungeeCord-Support.patch

@@ -1,4 +1,4 @@
-From df4dce8d4d2f09f2ce8645c6a10ccaaf6db57254 Mon Sep 17 00:00:00 2001
+From 27f6ceb7a4ed65d7d04d6be7efce9cbbf5188a65 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
@@ -59,7 +59,7 @@ index fcd4136..fb4ec7b 100644
                      event.disallow(asyncEvent.getResult(), asyncEvent.getKickMessage());
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java
-index afa0f04..e1db1be 100644
+index f25852e..b327310 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Spigot.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java
 @@ -54,6 +54,7 @@ public class Spigot {

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

@@ -1,4 +1,4 @@
-From 6524a3b75751f2b723d6999a2ab08374b7409dbd Mon Sep 17 00:00:00 2001
+From bdcdd72dc9878325c316a5595fb7d1ef0224aea1 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
@@ -19,7 +19,7 @@ index d57ed7a..6a6181c 100644
  
      public abstract boolean T();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java
-index e1db1be..0e917e2 100644
+index b327310..b28f745 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Spigot.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java
 @@ -55,6 +55,7 @@ public class Spigot {

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

@@ -1,4 +1,4 @@
-From 6d8484689bc3524ca94f90821051cb5679c633f4 Mon Sep 17 00:00:00 2001
+From eaaa019cdcb5299aff6e559f8a994de977ffb6dc 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/0034-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch

@@ -1,4 +1,4 @@
-From 50181317d1a383df33e5ae9ddcde5fbe0fd8fcd0 Mon Sep 17 00:00:00 2001
+From b14eb452993c78acf37685b5c0a39cbc9fae836c 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/0035-InventoryClickEvent-now-can-return-if-the-click-was-.patch

@@ -1,4 +1,4 @@
-From 0aa4fb4c7cd3c73c1bbc8234cc21d677d9505233 Mon Sep 17 00:00:00 2001
+From 8ea1953b38cabdbc03f90d19d79c519f103b8de8 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/0036-Enable-Improved-ping-sending.patch

@@ -1,4 +1,4 @@
-From 5317680eeb4c666e77c17c152d8ae184890c42f4 Mon Sep 17 00:00:00 2001
+From 4204de932f4343febfd8d1b7e25edb9ccd6f8d10 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/0037-Prevent-handshake-spam-from-invalid-names.patch

@@ -1,4 +1,4 @@
-From 02595714633a1628bbccf8ee69e8fb4cb42ec2aa Mon Sep 17 00:00:00 2001
+From 027ce59bdca943351a403d8bec0e6397db887175 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/0038-Save-entity-counts-for-randomly-spawned-creatures-to.patch

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

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

@@ -1,4 +1,4 @@
-From 357aaae4276ecb50801aa79a62049399d9f160c7 Mon Sep 17 00:00:00 2001
+From 7ee0a66502aeb629a002b346fcd7c4cfb2de0257 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Thread Naming and Tweaks
 Removes the sleep forever thread and adds useful names for debugging to all staged thread files.
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 097be65..f37c784 100644
+index e4f1cbe..048196e 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -34,7 +34,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer

CraftBukkit-Patches/0040-Fixes-BUKKIT-3893-Close-world-save-files-when-world-.patch

@@ -1,4 +1,4 @@
-From eba4a4425c443769e26a64640532f43d2bee04cc Mon Sep 17 00:00:00 2001
+From 0f9b140ce9f9ffde372ff7b9eec431bb71861e69 Mon Sep 17 00:00:00 2001
 From: Antony Riley <antony@cyberiantiger.org>
 Date: Wed, 27 Mar 2013 01:41:54 +0200
 Subject: [PATCH] Fixes BUKKIT-3893 - Close world save files when world is

CraftBukkit-Patches/0041-Optimized-version-of-LocaleLanguage.patch

@@ -1,4 +1,4 @@
-From 14cfdef4dcf4444bb77a94f927077588e4a58bd5 Mon Sep 17 00:00:00 2001
+From 7fc33371f89d29558ce22c66fcec47e6b1b13038 Mon Sep 17 00:00:00 2001
 From: snowleo <schneeleo@gmail.com>
 Date: Wed, 8 May 2013 12:09:45 +1000
 Subject: [PATCH] Optimized version of LocaleLanguage

CraftBukkit-Patches/0042-Improve-next-tick-list-performance-on-chunk-unloads-.patch

@@ -1,4 +1,4 @@
-From 5cca431dbcda5512e12ccb887ae8e8e741c57b18 Mon Sep 17 00:00:00 2001
+From 6db12ad6017b2f85d480e1f3609a269573a65adc Mon Sep 17 00:00:00 2001
 From: Mike Primm <mike@primmhome.com>
 Date: Wed, 24 Apr 2013 01:43:33 -0500
 Subject: [PATCH] Improve next-tick-list performance on chunk unloads, large
@@ -308,5 +308,5 @@ index a2f7fee..b0c2c96 100644
 +    // Spigot end 
  }
 -- 
-1.8.1.3
+1.8.2.1