Migrate the crop fixes by @Aikar to the core patch.

CraftBukkit-Patches/0002-Spigot-Changes.patch

@@ -1,16 +1,17 @@
-From d004dd8e2788cce2d6af393d256ba22c77bf4cd5 Mon Sep 17 00:00:00 2001
+From 8d5b6b24e389d3a3aa669bfd01d61dab9b347eae Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 09:39:40 +1100
-Subject: [PATCH] Spigot changes.
+Subject: [PATCH] Spigot Changes
 
+The set of changes which provide core Spigot functionality, which would otherwise be a mess to try and apply individually.
 ---
  .gitignore                                         |   2 +
  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 +-
- src/main/java/net/minecraft/server/BlockGrass.java |   2 +-
+ src/main/java/net/minecraft/server/BlockGrass.java |   3 +-
  .../java/net/minecraft/server/BlockMushroom.java   |   2 +-
- src/main/java/net/minecraft/server/BlockMycel.java |   2 +-
+ src/main/java/net/minecraft/server/BlockMycel.java |   3 +-
  src/main/java/net/minecraft/server/BlockReed.java  |   2 +-
  .../java/net/minecraft/server/BlockSapling.java    |   2 +-
  src/main/java/net/minecraft/server/BlockStem.java  |   2 +-
@@ -29,7 +30,7 @@ Subject: [PATCH] Spigot changes.
  .../craftbukkit/chunkio/ChunkIOProvider.java       |   2 +-
  .../org/bukkit/craftbukkit/entity/CraftPlayer.java |   7 ++
  src/main/resources/configurations/bukkit.yml       |  25 +++++
- 25 files changed, 390 insertions(+), 78 deletions(-)
+ 25 files changed, 392 insertions(+), 78 deletions(-)
  create mode 100644 src/main/java/org/bukkit/craftbukkit/Spigot.java
 
 diff --git a/.gitignore b/.gitignore
@@ -65,7 +66,7 @@ index 4392cb2..8e041c2 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java
-index 83cc09d..4fb2d87 100644
+index 83cc09d..eed8ded 100644
 --- a/src/main/java/net/minecraft/server/BlockCactus.java
 +++ b/src/main/java/net/minecraft/server/BlockCactus.java
 @@ -23,7 +23,7 @@ public class BlockCactus extends Block {
@@ -73,12 +74,12 @@ index 83cc09d..4fb2d87 100644
                  int i1 = world.getData(i, j, k);
  
 -                if (i1 == 15) {
-+                if (i1 >= (byte) range(3, (world.growthOdds * 100 / world.getWorld().cactusGrowthModifier * 15 / 100F) + 0.5F, 15)) { // Spigot
++                if (i1 >= (byte) range(3, (world.growthOdds / world.getWorld().cactusGrowthModifier * 15) + 0.5F, 15)) { // Spigot
                      org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockGrowEvent(world, i, j + 1, k, this.id, 0); // CraftBukkit
                      world.setData(i, j, k, 0, 4);
                      this.doPhysics(world, i, j + 1, k, this.id);
 diff --git a/src/main/java/net/minecraft/server/BlockCrops.java b/src/main/java/net/minecraft/server/BlockCrops.java
-index 14a1c3b..0c6ec6d 100644
+index 14a1c3b..0aee7af 100644
 --- a/src/main/java/net/minecraft/server/BlockCrops.java
 +++ b/src/main/java/net/minecraft/server/BlockCrops.java
 @@ -28,7 +28,7 @@ public class BlockCrops extends BlockFlower {
@@ -86,25 +87,26 @@ index 14a1c3b..0c6ec6d 100644
                  float f = this.k(world, i, j, k);
  
 -                if (random.nextInt((int) (25.0F / f) + 1) == 0) {
-+                if (random.nextInt((int) ((world.growthOdds * 100 / world.getWorld().wheatGrowthModifier / 25.0F) / f) + 1) == 0) { // Spigot
++                if (random.nextInt((int) (world.growthOdds / world.getWorld().wheatGrowthModifier * (25.0F / f)) + 1) == 0) { // Spigot
                      org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockGrowEvent(world, i, j, k, this.id, ++l); // CraftBukkit
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/BlockGrass.java b/src/main/java/net/minecraft/server/BlockGrass.java
-index 6f9301d..c78a934 100644
+index 6f9301d..2ccc0b8 100644
 --- a/src/main/java/net/minecraft/server/BlockGrass.java
 +++ b/src/main/java/net/minecraft/server/BlockGrass.java
-@@ -32,7 +32,7 @@ public class BlockGrass extends Block {
+@@ -32,7 +32,8 @@ public class BlockGrass extends Block {
                  }
                  // CraftBukkit end
              } else if (world.getLightLevel(i, j + 1, k) >= 9) {
 -                for (int l = 0; l < 4; ++l) {
-+                for (int l = 0; l < Math.max(4, Math.max(20, (int) (4 * 100F / world.growthOdds))); ++l) { // Spigot
++                int numGrowth = Math.min(4, Math.max(20, (int) (4 * 100F / world.growthOdds))); // Spigot
++                for (int l = 0; l < numGrowth; ++l) { // Spigot
                      int i1 = i + random.nextInt(3) - 1;
                      int j1 = j + random.nextInt(5) - 3;
                      int k1 = k + random.nextInt(3) - 1;
 diff --git a/src/main/java/net/minecraft/server/BlockMushroom.java b/src/main/java/net/minecraft/server/BlockMushroom.java
-index 872ad00..aedcf62 100644
+index 872ad00..6e135a4 100644
 --- a/src/main/java/net/minecraft/server/BlockMushroom.java
 +++ b/src/main/java/net/minecraft/server/BlockMushroom.java
 @@ -27,7 +27,7 @@ public class BlockMushroom extends BlockFlower {
@@ -112,25 +114,26 @@ index 872ad00..aedcf62 100644
      public void a(World world, int i, int j, int k, Random random) {
          final int sourceX = i, sourceY = j, sourceZ = k; // CraftBukkit
 -        if (random.nextInt(25) == 0) {
-+        if (random.nextInt((int) (world.growthOdds * 100 / world.getWorld().mushroomGrowthModifier * 25)) == 0) { // Spigot
++        if (random.nextInt(Math.max(1, (int) world.growthOdds / world.getWorld().mushroomGrowthModifier * 25)) == 0) { // Spigot
              byte b0 = 4;
              int l = 5;
  
 diff --git a/src/main/java/net/minecraft/server/BlockMycel.java b/src/main/java/net/minecraft/server/BlockMycel.java
-index 1de8c83..522d317 100644
+index 1de8c83..fa11d1c 100644
 --- a/src/main/java/net/minecraft/server/BlockMycel.java
 +++ b/src/main/java/net/minecraft/server/BlockMycel.java
-@@ -32,7 +32,7 @@ public class BlockMycel extends Block {
+@@ -32,7 +32,8 @@ public class BlockMycel extends Block {
                  }
                  // CraftBukkit end
              } else if (world.getLightLevel(i, j + 1, k) >= 9) {
 -                for (int l = 0; l < 4; ++l) {
-+                for (int l = 0; l < Math.max(4, Math.max(20, (int) (4 * 100F / world.growthOdds))); ++l) { // Spigot
++                int numGrowth = Math.min(4, Math.max(20, (int) (4 * 100F / world.growthOdds))); // Spigot
++                for (int l = 0; l < numGrowth; ++l) { // Spigot
                      int i1 = i + random.nextInt(3) - 1;
                      int j1 = j + random.nextInt(5) - 3;
                      int k1 = k + random.nextInt(3) - 1;
 diff --git a/src/main/java/net/minecraft/server/BlockReed.java b/src/main/java/net/minecraft/server/BlockReed.java
-index 8657860..def38e9 100644
+index 8657860..50c5200 100644
 --- a/src/main/java/net/minecraft/server/BlockReed.java
 +++ b/src/main/java/net/minecraft/server/BlockReed.java
 @@ -23,7 +23,7 @@ public class BlockReed extends Block {
@@ -138,7 +141,7 @@ index 8657860..def38e9 100644
                  int i1 = world.getData(i, j, k);
  
 -                if (i1 == 15) {
-+                if (i1 >= (byte) range(3, (world.growthOdds * 100 / world.getWorld().sugarGrowthModifier * 15 / 100F) + 0.5F, 15)) { // Spigot
++                if (i1 >= (byte) range(3, (world.growthOdds / world.getWorld().sugarGrowthModifier * 15) + 0.5F, 15)) { // Spigot
                      org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockGrowEvent(world, i, j + 1, k, this.id, 0); // CraftBukkit
                      world.setData(i, j, k, 0, 4);
                  } else {
@@ -156,7 +159,7 @@ index 56938cd..7217ed6 100644
              }
          }
 diff --git a/src/main/java/net/minecraft/server/BlockStem.java b/src/main/java/net/minecraft/server/BlockStem.java
-index 8339a35..a945ee4 100644
+index 8339a35..c17ce36 100644
 --- a/src/main/java/net/minecraft/server/BlockStem.java
 +++ b/src/main/java/net/minecraft/server/BlockStem.java
 @@ -27,7 +27,7 @@ public class BlockStem extends BlockFlower {
@@ -164,7 +167,7 @@ index 8339a35..a945ee4 100644
              float f = this.m(world, i, j, k);
  
 -            if (random.nextInt((int) (25.0F / f) + 1) == 0) {
-+            if (random.nextInt((int) ((world.growthOdds * 100 / ((this.id == Block.PUMPKIN_STEM.id) ? world.getWorld().pumpkinGrowthModifier : world.getWorld().melonGrowthModifier) / 25.0F) / f) + 1) == 0) { // Spigot
++            if (random.nextInt((int) (world.growthOdds / (this.id == Block.PUMPKIN_STEM.id ? world.getWorld().pumpkinGrowthModifier : world.getWorld().melonGrowthModifier) * (25.0F / f)) + 1) == 0) { // Spigot
                  int l = world.getData(i, j, k);
  
                  if (l < 7) {

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

@@ -1,4 +1,4 @@
-From ef9fda7e53835b13b36dc8e9ab235e4676069140 Mon Sep 17 00:00:00 2001
+From ad4a3b8942231a2542ef3672d0c398d46023d8da 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/0009-Fix-various-crop-growth-modifier-formula-issues.patch

@@ -1,111 +0,0 @@
-From f07d661fbec7e2a091c52ad124cfefea3e8c11c6 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Fri, 11 Jan 2013 11:08:45 -0500
-Subject: [PATCH] Fix various crop growth modifier formula issues
-
----
- src/main/java/net/minecraft/server/BlockCactus.java   | 2 +-
- src/main/java/net/minecraft/server/BlockCrops.java    | 2 +-
- src/main/java/net/minecraft/server/BlockGrass.java    | 3 ++-
- src/main/java/net/minecraft/server/BlockMushroom.java | 2 +-
- src/main/java/net/minecraft/server/BlockMycel.java    | 3 ++-
- src/main/java/net/minecraft/server/BlockReed.java     | 2 +-
- src/main/java/net/minecraft/server/BlockStem.java     | 2 +-
- 7 files changed, 9 insertions(+), 7 deletions(-)
-
-diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java
-index 4fb2d87..eed8ded 100644
---- a/src/main/java/net/minecraft/server/BlockCactus.java
-+++ b/src/main/java/net/minecraft/server/BlockCactus.java
-@@ -23,7 +23,7 @@ public class BlockCactus extends Block {
-             if (l < 3) {
-                 int i1 = world.getData(i, j, k);
- 
--                if (i1 >= (byte) range(3, (world.growthOdds * 100 / world.getWorld().cactusGrowthModifier * 15 / 100F) + 0.5F, 15)) { // Spigot
-+                if (i1 >= (byte) range(3, (world.growthOdds / world.getWorld().cactusGrowthModifier * 15) + 0.5F, 15)) { // Spigot
-                     org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockGrowEvent(world, i, j + 1, k, this.id, 0); // CraftBukkit
-                     world.setData(i, j, k, 0, 4);
-                     this.doPhysics(world, i, j + 1, k, this.id);
-diff --git a/src/main/java/net/minecraft/server/BlockCrops.java b/src/main/java/net/minecraft/server/BlockCrops.java
-index 0c6ec6d..0aee7af 100644
---- a/src/main/java/net/minecraft/server/BlockCrops.java
-+++ b/src/main/java/net/minecraft/server/BlockCrops.java
-@@ -28,7 +28,7 @@ public class BlockCrops extends BlockFlower {
-             if (l < 7) {
-                 float f = this.k(world, i, j, k);
- 
--                if (random.nextInt((int) ((world.growthOdds * 100 / world.getWorld().wheatGrowthModifier / 25.0F) / f) + 1) == 0) { // Spigot
-+                if (random.nextInt((int) (world.growthOdds / world.getWorld().wheatGrowthModifier * (25.0F / f)) + 1) == 0) { // Spigot
-                     org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockGrowEvent(world, i, j, k, this.id, ++l); // CraftBukkit
-                 }
-             }
-diff --git a/src/main/java/net/minecraft/server/BlockGrass.java b/src/main/java/net/minecraft/server/BlockGrass.java
-index c78a934..2ccc0b8 100644
---- a/src/main/java/net/minecraft/server/BlockGrass.java
-+++ b/src/main/java/net/minecraft/server/BlockGrass.java
-@@ -32,7 +32,8 @@ public class BlockGrass extends Block {
-                 }
-                 // CraftBukkit end
-             } else if (world.getLightLevel(i, j + 1, k) >= 9) {
--                for (int l = 0; l < Math.max(4, Math.max(20, (int) (4 * 100F / world.growthOdds))); ++l) { // Spigot
-+                int numGrowth = Math.min(4, Math.max(20, (int) (4 * 100F / world.growthOdds))); // Spigot
-+                for (int l = 0; l < numGrowth; ++l) { // Spigot
-                     int i1 = i + random.nextInt(3) - 1;
-                     int j1 = j + random.nextInt(5) - 3;
-                     int k1 = k + random.nextInt(3) - 1;
-diff --git a/src/main/java/net/minecraft/server/BlockMushroom.java b/src/main/java/net/minecraft/server/BlockMushroom.java
-index aedcf62..6e135a4 100644
---- a/src/main/java/net/minecraft/server/BlockMushroom.java
-+++ b/src/main/java/net/minecraft/server/BlockMushroom.java
-@@ -27,7 +27,7 @@ public class BlockMushroom extends BlockFlower {
- 
-     public void a(World world, int i, int j, int k, Random random) {
-         final int sourceX = i, sourceY = j, sourceZ = k; // CraftBukkit
--        if (random.nextInt((int) (world.growthOdds * 100 / world.getWorld().mushroomGrowthModifier * 25)) == 0) { // Spigot
-+        if (random.nextInt(Math.max(1, (int) world.growthOdds / world.getWorld().mushroomGrowthModifier * 25)) == 0) { // Spigot
-             byte b0 = 4;
-             int l = 5;
- 
-diff --git a/src/main/java/net/minecraft/server/BlockMycel.java b/src/main/java/net/minecraft/server/BlockMycel.java
-index 522d317..fa11d1c 100644
---- a/src/main/java/net/minecraft/server/BlockMycel.java
-+++ b/src/main/java/net/minecraft/server/BlockMycel.java
-@@ -32,7 +32,8 @@ public class BlockMycel extends Block {
-                 }
-                 // CraftBukkit end
-             } else if (world.getLightLevel(i, j + 1, k) >= 9) {
--                for (int l = 0; l < Math.max(4, Math.max(20, (int) (4 * 100F / world.growthOdds))); ++l) { // Spigot
-+                int numGrowth = Math.min(4, Math.max(20, (int) (4 * 100F / world.growthOdds))); // Spigot
-+                for (int l = 0; l < numGrowth; ++l) { // Spigot
-                     int i1 = i + random.nextInt(3) - 1;
-                     int j1 = j + random.nextInt(5) - 3;
-                     int k1 = k + random.nextInt(3) - 1;
-diff --git a/src/main/java/net/minecraft/server/BlockReed.java b/src/main/java/net/minecraft/server/BlockReed.java
-index def38e9..50c5200 100644
---- a/src/main/java/net/minecraft/server/BlockReed.java
-+++ b/src/main/java/net/minecraft/server/BlockReed.java
-@@ -23,7 +23,7 @@ public class BlockReed extends Block {
-             if (l < 3) {
-                 int i1 = world.getData(i, j, k);
- 
--                if (i1 >= (byte) range(3, (world.growthOdds * 100 / world.getWorld().sugarGrowthModifier * 15 / 100F) + 0.5F, 15)) { // Spigot
-+                if (i1 >= (byte) range(3, (world.growthOdds / world.getWorld().sugarGrowthModifier * 15) + 0.5F, 15)) { // Spigot
-                     org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockGrowEvent(world, i, j + 1, k, this.id, 0); // CraftBukkit
-                     world.setData(i, j, k, 0, 4);
-                 } else {
-diff --git a/src/main/java/net/minecraft/server/BlockStem.java b/src/main/java/net/minecraft/server/BlockStem.java
-index a945ee4..c17ce36 100644
---- a/src/main/java/net/minecraft/server/BlockStem.java
-+++ b/src/main/java/net/minecraft/server/BlockStem.java
-@@ -27,7 +27,7 @@ public class BlockStem extends BlockFlower {
-         if (world.getLightLevel(i, j + 1, k) >= 9) {
-             float f = this.m(world, i, j, k);
- 
--            if (random.nextInt((int) ((world.growthOdds * 100 / ((this.id == Block.PUMPKIN_STEM.id) ? world.getWorld().pumpkinGrowthModifier : world.getWorld().melonGrowthModifier) / 25.0F) / f) + 1) == 0) { // Spigot
-+            if (random.nextInt((int) (world.growthOdds / (this.id == Block.PUMPKIN_STEM.id ? world.getWorld().pumpkinGrowthModifier : world.getWorld().melonGrowthModifier) * (25.0F / f)) + 1) == 0) { // Spigot
-                 int l = world.getData(i, j, k);
- 
-                 if (l < 7) {
--- 
-1.8.1-rc2
-

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

@@ -1,4 +1,4 @@
-From 3f6fe28ec20e0597dbdcf1c49e3d1b77e18494f9 Mon Sep 17 00:00:00 2001
+From 73631eccc7d568556fb58e0c389ec2f36bf43822 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/0011-Update-versioning-check-to-correctly-resolve-api-ver.patch

@@ -1,4 +1,4 @@
-From b898ae83fbb7311b28c72e0a438f978fee141eaf Mon Sep 17 00:00:00 2001
+From 231e34c513d7945454f53ae9a9fd0c928967cb92 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/0012-Optimize-packet-used-to-unload-chunks-for-the-client.patch

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

@@ -1,4 +1,4 @@
-From 7291eb00715590e098ef1478c11e8c39c8b39a04 Mon Sep 17 00:00:00 2001
+From 6d1cab4f301abdde09893c433757ab58b00bd296 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/0014-Alternate-sync-free-but-safe-chunk-reference-cache.patch

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

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

@@ -1,4 +1,4 @@
-From af64eacbd621fb551bfb2378d7e5e8db74a21b6a Mon Sep 17 00:00:00 2001
+From 7e62ae8817fd9a0033902291940626f0f099b669 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/0017-Add-oreobfuscator-for-Spigot.patch

@@ -1,4 +1,4 @@
-From bbd48168b30e50034297a255b3b251fa60631ebb Mon Sep 17 00:00:00 2001
+From d097a38c9de9968273e46a4d4c89ab7dfe833dbc Mon Sep 17 00:00:00 2001
 From: lishid <lishid@gmail.com>
 Date: Sat, 16 Feb 2013 10:05:25 +1100
 Subject: [PATCH] Add oreobfuscator for Spigot.

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

@@ -1,4 +1,4 @@
-From 2de89494d456b2d4f2b129f6a2174271fa26ed2a Mon Sep 17 00:00:00 2001
+From 46f4036615ca43f25d593acb0f343211a2e0fe64 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/0019-Only-count-entities-in-chunks-being-processed-for-th.patch

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

@@ -1,4 +1,4 @@
-From 17b87c50187fe2dd65832d1b8bd5e1b627425d2c Mon Sep 17 00:00:00 2001
+From 8c6c0bba7cabdf3e6da9639352b768bbb2b2eb91 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/0021-Detect-remove-and-warn-about-null-tile-entities.patch

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

@@ -1,4 +1,4 @@
-From 03753a3621b236da0c9e47c046c313d9affbaffd Mon Sep 17 00:00:00 2001
+From aa8040ec37080586df5f64493f42381b37661bf8 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/0023-Optimize-getTileEntities-performance.patch

@@ -1,4 +1,4 @@
-From 60c41aa2d4d73fc1786e53b5e45ad3aff9156342 Mon Sep 17 00:00:00 2001
+From 2520d29faa1840fae6fd2a2acf03b6f0069be4b6 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

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

@@ -1,4 +1,4 @@
-From 0e6962f92f84e0e32e30c99611ee40b4f7d4c262 Mon Sep 17 00:00:00 2001
+From e0873ccbde226c3bb0abc6d703cb728075a3a25a 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/0025-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch

@@ -1,4 +1,4 @@
-From f3098aec724dd2d41c3c2c5c1c44a74e7ab0124f Mon Sep 17 00:00:00 2001
+From f6429bed849b1a286b7cd69fac7bacd168d54790 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/0026-Watchdog-Thread.patch

@@ -1,4 +1,4 @@
-From 55779a29f1a3efefc374cfbb257be13511e64985 Mon Sep 17 00:00:00 2001
+From 64483fc7a96665193fea41e27500fa1eee4eeaeb 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/0027-Netty.patch

@@ -1,4 +1,4 @@
-From 2fda9f46b36ce7627c1f37785fc8bf4892f8a161 Mon Sep 17 00:00:00 2001
+From d6d844fe65d62ff1fe801fe91449b81a501019bc 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/0028-Enable-Improved-ping-sending.patch

@@ -1,4 +1,4 @@
-From 370cd20cfd780ab697c775f518975e08cc42e5a4 Mon Sep 17 00:00:00 2001
+From 37cd1564eafcfa88bc53a2d3c743e87be5205e0e 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/0029-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch

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

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

@@ -1,4 +1,4 @@
-From 18955462c17edb36668a1d4b03a74c24c0808aa0 Mon Sep 17 00:00:00 2001
+From c31fafe4629fbfe447a9cbd81e3a92e2f7fb987f 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/0032-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch

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

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

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

@@ -1,4 +1,4 @@
-From a3406722b3156cd56a2ec999a081439d99d0a1d4 Mon Sep 17 00:00:00 2001
+From 6bcd357be1e5ad110d47e7ecdda0f62d3ee7001c 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/0036-Thread-safety.-Adds-thread-safety-for-chunk-load-unl.patch

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

CraftBukkit-Patches/0037-Faster-UUID-for-entities.patch

@@ -1,4 +1,4 @@
-From ed0189f093f3fc480ac6d68cbedbfb6e568b7222 Mon Sep 17 00:00:00 2001
+From 4314282ffb1d18eb45aa8a748a38b1c8fe41888c 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/0038-Prevent-NPE-in-CraftSign.patch

@@ -1,4 +1,4 @@
-From 10e96dbc1a41b0e6c7d754283c35dd1c16acf627 Mon Sep 17 00:00:00 2001
+From d83fbc063ceb0c035c5a1007c9990f559b5641d6 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/0039-Stage-DataWatcher-WatchableObject.patch

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