Bump thread safety patch up.

CraftBukkit-Patches/0005-Thread-safety.-Adds-thread-safety-for-chunk-load-unl.patch

@@ -1,4 +1,4 @@
-From 6de20346387435347c9a64a000c53f085db2a291 Mon Sep 17 00:00:00 2001
+From 60bfde2f20cab9fade83e6f34af2a2ee5ed168c9 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] Thread safety. Adds thread safety for chunk load / unload
@@ -9,10 +9,10 @@ Subject: [PATCH] Thread safety. Adds thread safety for chunk load / unload
  1 file changed, 3 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 80762c1..3bfc669 100644
+index 9343d46..b569dc4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -256,6 +256,7 @@ public class CraftWorld implements World {
+@@ -232,6 +232,7 @@ public class CraftWorld implements World {
      }
  
      public boolean unloadChunkRequest(int x, int z, boolean safe) {
@@ -20,7 +20,7 @@ index 80762c1..3bfc669 100644
          if (safe && isChunkInUse(x, z)) {
              return false;
          }
-@@ -266,6 +267,7 @@ public class CraftWorld implements World {
+@@ -242,6 +243,7 @@ public class CraftWorld implements World {
      }
  
      public boolean unloadChunk(int x, int z, boolean save, boolean safe) {
@@ -28,7 +28,7 @@ index 80762c1..3bfc669 100644
          if (safe && isChunkInUse(x, z)) {
              return false;
          }
-@@ -333,6 +335,7 @@ public class CraftWorld implements World {
+@@ -309,6 +311,7 @@ public class CraftWorld implements World {
      }
  
      public boolean loadChunk(int x, int z, boolean generate) {

CraftBukkit-Patches/0006-View-Distance.patch

@@ -1,4 +1,4 @@
-From 8a13d0f677be4842ed291347c14892c2932d500d Mon Sep 17 00:00:00 2001
+From 10d11c93ed159884b0fbb4a6dac6517a695d848b 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
@@ -25,7 +25,7 @@ index f788a62..98d6dd2 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 05b2d6d..9902506 100644
+index b7dfe40..8706874 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
@@ -38,7 +38,7 @@ index 05b2d6d..9902506 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 9343d46..f81ca3e 100644
+index b569dc4..2f72654 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -118,6 +118,9 @@ public class CraftWorld implements World {

CraftBukkit-Patches/0007-Address-BUKKIT-3286-by-firing-the-inventory-close-ev.patch

@@ -1,4 +1,4 @@
-From c10928016124ddbd042e7b5ec97dfbf196cfab15 Mon Sep 17 00:00:00 2001
+From d07d3b2724a125ba3208286bccacc3f35d5b172c Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@bigpond.com>
 Date: Sun, 23 Dec 2012 17:09:40 +1100
 Subject: [PATCH] Address BUKKIT-3286 by firing the inventory close event when

CraftBukkit-Patches/0008-Include-NibbleArray-from-mc-dev-for-diff-visibility.patch

@@ -1,4 +1,4 @@
-From b1188994f419db30faf032efdd1b3945d4046441 Mon Sep 17 00:00:00 2001
+From 3517624edf4a6a81a8d2c72f88aab4184c48ab22 Mon Sep 17 00:00:00 2001
 From: Mike Primm <mike@primmhome.com>
 Date: Fri, 14 Dec 2012 21:51:06 -0600
 Subject: [PATCH] Include NibbleArray from mc-dev for diff visibility

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

@@ -1,4 +1,4 @@
-From 6cc2da43b3876e687bd7237ed42a09332d2d7c84 Mon Sep 17 00:00:00 2001
+From ed50f7edd8769c0e6200638a0ea5bc199d8226a5 Mon Sep 17 00:00:00 2001
 From: Mike Primm <mike@primmhome.com>
 Date: Sun, 23 Dec 2012 14:46:23 -0600
 Subject: [PATCH] Implement 'lightening' of NibbleArrays - only allocate

CraftBukkit-Patches/0010-Add-OldChunkLoader-from-mc-dev-for-diff-visibility.patch

@@ -1,4 +1,4 @@
-From ad4a3b8942231a2542ef3672d0c398d46023d8da Mon Sep 17 00:00:00 2001
+From d34c61c7f2471315cf6803636daaa3cd71f5cf0c Mon Sep 17 00:00:00 2001
 From: Agaricus <agaricusb@yahoo.com>
 Date: Sun, 13 Jan 2013 03:41:38 -0800
 Subject: [PATCH] Add OldChunkLoader from mc-dev for diff visibility

CraftBukkit-Patches/0011-Fix-mcRegion-to-Anvil-conversion.patch

@@ -1,4 +1,4 @@
-From 73631eccc7d568556fb58e0c389ec2f36bf43822 Mon Sep 17 00:00:00 2001
+From e6c8fc17b4cf941744f97ff6e02f02d7b8eec95e Mon Sep 17 00:00:00 2001
 From: Agaricus <agaricusb@yahoo.com>
 Date: Sun, 13 Jan 2013 03:49:07 -0800
 Subject: [PATCH] Fix mcRegion-to-Anvil conversion

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

@@ -1,4 +1,4 @@
-From 231e34c513d7945454f53ae9a9fd0c928967cb92 Mon Sep 17 00:00:00 2001
+From 35638957409ffd561484f2743949c9dcfad13b96 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.

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

@@ -1,4 +1,4 @@
-From 0a8590c1fd3a138a029439a17634f0640c03491e Mon Sep 17 00:00:00 2001
+From 673562df1386db956378bc516a9b3e605ce410b0 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/0014-Skip-entity.move-if-we-are-not-moving-anywhere.patch

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

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

@@ -1,4 +1,4 @@
-From f3c9fb3dfd01709c855e6caff005e9c1c64c5e4c Mon Sep 17 00:00:00 2001
+From 5058791bca4fb2b06a84d82dd5b55925675b4aa3 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/0016-Tick-loop-optimization-sleep-for-as-long-as-possible.patch

@@ -1,4 +1,4 @@
-From 1a3326c90c79008509e5917ddbce222a6e9ab77e Mon Sep 17 00:00:00 2001
+From 65c1f24a4c7d40f412f65fcbe558f66c9b1a14bd 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/0017-Improved-Timings-System.patch

@@ -1,4 +1,4 @@
-From 7e62ae8817fd9a0033902291940626f0f099b669 Mon Sep 17 00:00:00 2001
+From da35e236d47b4cf1f8abc96b0956e07ff4c97703 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
@@ -381,7 +381,7 @@ index 7862b43..dd61607 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 9902506..836da20 100644
+index 8706874..8d2c73e 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -169,9 +169,12 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate

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

@@ -1,4 +1,4 @@
-From 54366c6d6fe0a33678bad98c9d179eccaefb20ab Mon Sep 17 00:00:00 2001
+From 401837b0e6fa648616e680c4adb8dd2f28423de8 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.
@@ -141,7 +141,7 @@ index 872c4ac..255de03 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 f81ca3e..fbab028 100644
+index 2f72654..cedaf59 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -121,6 +121,8 @@ public class CraftWorld implements World {

CraftBukkit-Patches/0019-Reduce-number-of-LivingEntity-collision-checks.patch

@@ -1,4 +1,4 @@
-From 46f4036615ca43f25d593acb0f343211a2e0fe64 Mon Sep 17 00:00:00 2001
+From 54317fee9adac9c0c59edd7d8c1aaeaa91b3f77b 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.

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

@@ -1,4 +1,4 @@
-From bc6821ed6e02495a329d974d0051e51e1143d506 Mon Sep 17 00:00:00 2001
+From f4081e585e922e8a1aca85d344094e4d0e4c3639 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/0021-Only-send-maps-in-item-frames-upon-tracking.patch

@@ -1,4 +1,4 @@
-From 8c6c0bba7cabdf3e6da9639352b768bbb2b2eb91 Mon Sep 17 00:00:00 2001
+From 8983a18841624df38cbcdbd03ff22a22268295bb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Feb 2013 17:26:20 -0500
 Subject: [PATCH] Only send maps in item frames upon tracking

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

@@ -1,4 +1,4 @@
-From a4623bfb348b20a0c080c79db94e8f9a6c94cfeb Mon Sep 17 00:00:00 2001
+From 6dfba0ed91a97e5035867d2e69837c1a788e9c74 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/0023-Entity-Activation-Range.patch

@@ -1,4 +1,4 @@
-From ec5887e4dec30708a0c515ce5a2e70cde34b7532 Mon Sep 17 00:00:00 2001
+From 9b92d009fe76ea4fa60853ecc131211ff7f448f2 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
@@ -124,7 +124,7 @@ index 09c3720..ca6d3f0 100644
              entity.V = entity.locY;
              entity.W = entity.locZ;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index fbab028..80762c1 100644
+index cedaf59..3bfc669 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -102,8 +102,14 @@ public class CraftWorld implements World {

CraftBukkit-Patches/0024-Optimize-getTileEntities-performance.patch

@@ -1,4 +1,4 @@
-From 2520d29faa1840fae6fd2a2acf03b6f0069be4b6 Mon Sep 17 00:00:00 2001
+From ac30ba224906c71b30b4f9fd50ea27a3ce260b66 Mon Sep 17 00:00:00 2001
 From: Mike Primm <mike@primmhome.com>
 Date: Wed, 20 Feb 2013 23:07:53 -0500
 Subject: [PATCH] Optimize getTileEntities performance
@@ -9,7 +9,7 @@ Avoid traversing tile entities for every loaded chunk
  1 file changed, 12 insertions(+), 9 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 836da20..177fa94 100644
+index 8d2c73e..b7ff543 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -658,17 +658,20 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate

CraftBukkit-Patches/0025-Improved-tile-entity-lookup-for-chunk-sending.patch

@@ -1,4 +1,4 @@
-From e0873ccbde226c3bb0abc6d703cb728075a3a25a Mon Sep 17 00:00:00 2001
+From c08dc8eba98d8e16cbcca6e3571299cd423617eb Mon Sep 17 00:00:00 2001
 From: shakytom <tom.roberts00@gmail.com>
 Date: Wed, 20 Feb 2013 22:34:38 -0500
 Subject: [PATCH] Improved tile entity lookup for chunk sending

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

@@ -1,4 +1,4 @@
-From 461372e8d5692a394570da7b0a7057ed5806224d Mon Sep 17 00:00:00 2001
+From 1dba07905ede84c7e1eb77db4d7c45284358a8a7 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/0027-Watchdog-Thread.patch

@@ -1,4 +1,4 @@
-From 9fff54f533fad7006a63b3f739bcb4c7b0fc9760 Mon Sep 17 00:00:00 2001
+From 63bf5cad042a511332edc488e25b53df78c64919 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/0028-Netty.patch

@@ -1,4 +1,4 @@
-From 9754489f5dabf0bc73ef3a5a0418f1274a01738d Mon Sep 17 00:00:00 2001
+From 96275c31d3c85ff5edecf5c6f9681629292546b4 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 14 Feb 2013 17:32:20 +1100
 Subject: [PATCH] Netty

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

@@ -1,4 +1,4 @@
-From 37cd1564eafcfa88bc53a2d3c743e87be5205e0e Mon Sep 17 00:00:00 2001
+From c9b8bc00e547b007a70f96813d3a838449ed56d1 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
@@ -50,7 +50,7 @@ index 79c52f6..c6513c8 100644
      public void sendAll(Packet packet) {
          for (int i = 0; i < this.players.size(); ++i) {
 diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml
-index c7014fa..472b36b 100644
+index ab8c5d6..3a875da 100644
 --- a/src/main/resources/configurations/bukkit.yml
 +++ b/src/main/resources/configurations/bukkit.yml
 @@ -31,6 +31,7 @@ settings:

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

@@ -1,4 +1,4 @@
-From 6d813688abefafea353d2fd00713158fc27dc225 Mon Sep 17 00:00:00 2001
+From 38f144fcd9d44015bb3db3530742c12708b49dfe 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/0031-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch

@@ -1,4 +1,4 @@
-From 3f131f4aef0b72b3ce60559f468d3cb12393621a Mon Sep 17 00:00:00 2001
+From 60853843626f89e89aa8aab3d8d320f2d6855620 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/0032-Identify-outside-slot-independent-of-inventory-type-.patch

@@ -1,4 +1,4 @@
-From c31fafe4629fbfe447a9cbd81e3a92e2f7fb987f Mon Sep 17 00:00:00 2001
+From 0caa529847ec93e28db06b1efc44bcd95024cae5 Mon Sep 17 00:00:00 2001
 From: EdGruberman <ed@rjump.com>
 Date: Thu, 21 Feb 2013 14:22:09 -0700
 Subject: [PATCH] Identify outside slot independent of inventory type; Fixes

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

@@ -1,4 +1,4 @@
-From dafbe37aa6ad9855dafcfd3ffb7091b41c9f290a Mon Sep 17 00:00:00 2001
+From 8ddc8e32fae996aaff284a7bbe59e1c0d9f084ea 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/0034-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch

@@ -1,4 +1,4 @@
-From 35703c0fc948c010a8f92da923909cd684abd86a Mon Sep 17 00:00:00 2001
+From adb39549b75e5e5e851484e05b4a8371a41ff517 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/0035-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch

@@ -1,4 +1,4 @@
-From 893a0efd15e4e8120f9d95a378a0caa05e408e1c Mon Sep 17 00:00:00 2001
+From 3e18c3f7430deb2f1d2961374c513fe7b1387ff9 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/0036-PlayerItemDamageEvent.patch

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