Split out getCubes patch

CraftBukkit-Patches/0005-Spigot-Changes.patch

@@ -1,6 +1,6 @@
-From 9689ef70b5f735de03b42766e0d8bef5cb5817a6 Mon Sep 17 00:00:00 2001
+From 3954712a256ec0cef75ca027cea84aa91ec43f41 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
-Date: Tue, 11 Jun 2013 12:02:53 +1000
+Date: Tue, 11 Jun 2013 12:16:05 +1000
 Subject: [PATCH] Spigot Changes
 
 
@@ -202,7 +202,7 @@ index b7e327b..0e3a6a1 100644
              String s2 = socketaddress.toString();
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 3a4ddea..70dd295 100644
+index 3a4ddea..4d0facf 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -66,14 +66,27 @@ public abstract class World implements IBlockAccess {
@@ -270,55 +270,7 @@ index 3a4ddea..70dd295 100644
          if (worldprovider != null) {
              this.worldProvider = worldprovider;
          } else if (this.worldData != null && this.worldData.j() != 0) {
-@@ -1016,6 +1037,39 @@ public abstract class World implements IBlockAccess {
-         int i1 = MathHelper.floor(axisalignedbb.c);
-         int j1 = MathHelper.floor(axisalignedbb.f + 1.0D);
- 
-+        // Spigot start
-+        int ystart = ((k - 1) < 0) ? 0 : (k - 1);
-+        for (int chunkx = (i >> 4); chunkx <= ((j - 1) >> 4); chunkx++) {
-+            int cx = chunkx << 4;
-+            for (int chunkz = (i1 >> 4); chunkz <= ((j1 - 1) >> 4); chunkz++) {
-+                if (!this.isChunkLoaded(chunkx, chunkz)) {
-+                    continue;
-+                }
-+                int cz = chunkz << 4;
-+                Chunk chunk = this.getChunkAt(chunkx, chunkz);
-+                // Compute ranges within chunk
-+                int xstart = (i < cx) ? cx : i;
-+                int xend = (j < (cx + 16)) ? j : (cx + 16);
-+                int zstart = (i1 < cz) ? cz : i1;
-+                int zend = (j1 < (cz + 16)) ? j1 : (cz + 16);
-+                // Loop through blocks within chunk
-+                for (int x = xstart; x < xend; x++) {
-+                    for (int z = zstart; z < zend; z++) {
-+                        for (int y = ystart; y < l; y++) {
-+                            int blkid = chunk.getTypeId(x - cx, y, z - cz);
-+                            if (blkid > 0) {
-+                                Block block = Block.byId[blkid];
-+
-+                                if (block != null) {
-+                                    block.a(this, x, y, z, axisalignedbb, this.M, entity);
-+                                }
-+                            }
-+                        }
-+                    }
-+                }
-+            }
-+        }
-+        /*
-         for (int k1 = i; k1 < j; ++k1) {
-             for (int l1 = i1; l1 < j1; ++l1) {
-                 if (this.isLoaded(k1, 64, l1)) {
-@@ -1029,6 +1083,7 @@ public abstract class World implements IBlockAccess {
-                 }
-             }
-         }
-+        */// Spigot end
- 
-         double d0 = 0.25D;
-         List list = this.getEntities(entity, axisalignedbb.grow(d0, d0, d0));
-@@ -1945,6 +2000,11 @@ public abstract class World implements IBlockAccess {
+@@ -1945,6 +1966,11 @@ public abstract class World implements IBlockAccess {
          this.worldData.setWeatherDuration(1);
      }
  
@@ -330,7 +282,7 @@ index 3a4ddea..70dd295 100644
      protected void B() {
          // this.chunkTickList.clear(); // CraftBukkit - removed
          this.methodProfiler.a("buildList");
-@@ -1954,25 +2014,42 @@ public abstract class World implements IBlockAccess {
+@@ -1954,25 +1980,42 @@ public abstract class World implements IBlockAccess {
          int j;
          int k;
  
@@ -387,7 +339,7 @@ index 3a4ddea..70dd295 100644
  
          this.methodProfiler.b();
          if (this.O > 0) {
-@@ -1980,7 +2057,7 @@ public abstract class World implements IBlockAccess {
+@@ -1980,7 +2023,7 @@ public abstract class World implements IBlockAccess {
          }
  
          this.methodProfiler.a("playerCheckLight");

CraftBukkit-Patches/0007-More-Efficient-GetCubes.patch

@@ -0,0 +1,69 @@
+From 31494624650dcc0c1cbb5b7811e155cb4a541181 Mon Sep 17 00:00:00 2001
+From: md_5 <md_5@live.com.au>
+Date: Tue, 11 Jun 2013 12:17:37 +1000
+Subject: [PATCH] More Efficient GetCubes
+
+
+diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
+index 4d0facf..44ccf51 100644
+--- a/src/main/java/net/minecraft/server/World.java
++++ b/src/main/java/net/minecraft/server/World.java
+@@ -1037,19 +1037,47 @@ public abstract class World implements IBlockAccess {
+         int i1 = MathHelper.floor(axisalignedbb.c);
+         int j1 = MathHelper.floor(axisalignedbb.f + 1.0D);
+ 
+-        for (int k1 = i; k1 < j; ++k1) {
+-            for (int l1 = i1; l1 < j1; ++l1) {
+-                if (this.isLoaded(k1, 64, l1)) {
+-                    for (int i2 = k - 1; i2 < l; ++i2) {
+-                        Block block = Block.byId[this.getTypeId(k1, i2, l1)];
+-
+-                        if (block != null) {
+-                            block.a(this, k1, i2, l1, axisalignedbb, this.M, entity);
++        // Spigot start
++        int ystart = ( ( k - 1 ) < 0 ) ? 0 : ( k - 1 );
++        for ( int chunkx = ( i >> 4 ); chunkx <= ( ( j - 1 ) >> 4 ); chunkx++ )
++        {
++            int cx = chunkx << 4;
++            for ( int chunkz = ( i1 >> 4 ); chunkz <= ( ( j1 - 1 ) >> 4 ); chunkz++ )
++            {
++                if ( !this.isChunkLoaded( chunkx, chunkz ) )
++                {
++                    continue;
++                }
++                int cz = chunkz << 4;
++                Chunk chunk = this.getChunkAt( chunkx, chunkz );
++                // Compute ranges within chunk
++                int xstart = ( i < cx ) ? cx : i;
++                int xend = ( j < ( cx + 16 ) ) ? j : ( cx + 16 );
++                int zstart = ( i1 < cz ) ? cz : i1;
++                int zend = ( j1 < ( cz + 16 ) ) ? j1 : ( cz + 16 );
++                // Loop through blocks within chunk
++                for ( int x = xstart; x < xend; x++ )
++                {
++                    for ( int z = zstart; z < zend; z++ )
++                    {
++                        for ( int y = ystart; y < l; y++ )
++                        {
++                            int blkid = chunk.getTypeId( x - cx, y, z - cz );
++                            if ( blkid > 0 )
++                            {
++                                Block block = Block.byId[blkid];
++
++                                if ( block != null )
++                                {
++                                    block.a( this, x, y, z, axisalignedbb, this.M, entity );
++                                }
++                            }
+                         }
+                     }
+                 }
+             }
+         }
++        // Spigot end
+ 
+         double d0 = 0.25D;
+         List list = this.getEntities(entity, axisalignedbb.grow(d0, d0, d0));
+-- 
+1.8.1.2
+

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

@@ -1,4 +1,4 @@
-From bca3a10c78e0bbf4943a727b482b9780acf82543 Mon Sep 17 00:00:00 2001
+From 163d8b5553ebbec1275d0cc48f896eb40c1e8de6 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/0009-Merge-tweaks-and-configuration.patch

@@ -1,4 +1,4 @@
-From 015476de434588438036e786082d4030c30f3d90 Mon Sep 17 00:00:00 2001
+From c0cfa283e961ba7cbe3b32a3665d20ba5d752fe4 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
@@ -41,7 +41,7 @@ index 0225f53..294ab8f 100644
              }
          } else {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 70dd295..b339688 100644
+index 44ccf51..9bc0172 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -949,6 +949,23 @@ public abstract class World implements IBlockAccess {

CraftBukkit-Patches/0010-LongHash-Tweaks.patch

@@ -1,4 +1,4 @@
-From b8419eef06b01e0f460101018d8e98987a3244ba Mon Sep 17 00:00:00 2001
+From 921555ba3dfa656399e34d653ad8a4d55f8e584e 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/0011-Async-Operation-Catching.patch

@@ -1,4 +1,4 @@
-From 9986fbb95bd13747885d26465c11b89b384e7f1f Mon Sep 17 00:00:00 2001
+From 00d20ac15781cb71b64d103c66c94ff83d08761d 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
@@ -46,7 +46,7 @@ index 5c03732..5f3c780 100644
              this.trackedPlayers.remove(entityplayer);
              entityplayer.removeQueue.add(Integer.valueOf(this.tracker.id));
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index b339688..3f9c453 100644
+index 9bc0172..a2d1447 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -918,6 +918,7 @@ public abstract class World implements IBlockAccess {
@@ -65,7 +65,7 @@ index b339688..3f9c453 100644
          entity.die();
          if (entity instanceof EntityHuman) {
              this.players.remove(entity);
-@@ -2449,6 +2451,7 @@ public abstract class World implements IBlockAccess {
+@@ -2443,6 +2445,7 @@ public abstract class World implements IBlockAccess {
      }
  
      public void a(List list) {

CraftBukkit-Patches/0012-View-Distance.patch

@@ -1,4 +1,4 @@
-From 2790bf62ff1f776411ca362ebc41ab0571f63bc8 Mon Sep 17 00:00:00 2001
+From 339073db1468e8d6c9dc38eefb73c34246f2e350 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

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

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

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

@@ -1,11 +1,11 @@
-From e0a6170dda0a8044bc1dd3f8e71f92d6dfcb078c Mon Sep 17 00:00:00 2001
+From c5f8d8c747887ce77e775f45c3941d10d05c8147 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 3f9c453..6d59bc3 100644
+index a2d1447..3038f80 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/0016-Tick-loop-optimization-sleep-for-as-long-as-possible.patch

@@ -1,4 +1,4 @@
-From 832dcaab6f83bf7cae55da87e718a77e04a4b211 Mon Sep 17 00:00:00 2001
+From 5080d5e708eb3f59614dc2e48239eac19f1dff51 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 3dfc8bdf20e23a8f70642101989912cc11ff1be7 Mon Sep 17 00:00:00 2001
+From 07c9c447262df050e0c5b2efc9b12fe6923a2ab7 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
@@ -266,7 +266,7 @@ index db3fc42..ffa9bb6 100644
      private static Map b = new HashMap();
      protected World world;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 6d59bc3..feb657b 100644
+index 3038f80..130d948 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -13,6 +13,7 @@ import java.util.concurrent.Callable;
@@ -294,7 +294,7 @@ index 6d59bc3..feb657b 100644
      }
  
      protected abstract IChunkProvider j();
-@@ -1271,6 +1275,7 @@ public abstract class World implements IBlockAccess {
+@@ -1265,6 +1269,7 @@ public abstract class World implements IBlockAccess {
          this.f.clear();
          this.methodProfiler.c("regular");
  
@@ -302,7 +302,7 @@ index 6d59bc3..feb657b 100644
          for (i = 0; i < this.entityList.size(); ++i) {
              entity = (Entity) this.entityList.get(i);
  
-@@ -1293,7 +1298,9 @@ public abstract class World implements IBlockAccess {
+@@ -1287,7 +1292,9 @@ public abstract class World implements IBlockAccess {
              this.methodProfiler.a("tick");
              if (!entity.dead) {
                  try {
@@ -312,7 +312,7 @@ index 6d59bc3..feb657b 100644
                  } catch (Throwable throwable1) {
                      crashreport = CrashReport.a(throwable1, "Ticking entity");
                      crashreportsystemdetails = crashreport.a("Entity being ticked");
-@@ -1318,7 +1325,9 @@ public abstract class World implements IBlockAccess {
+@@ -1312,7 +1319,9 @@ public abstract class World implements IBlockAccess {
              this.methodProfiler.b();
          }
  
@@ -322,7 +322,7 @@ index 6d59bc3..feb657b 100644
          this.N = true;
          Iterator iterator = this.tileEntityList.iterator();
  
-@@ -1333,8 +1342,11 @@ public abstract class World implements IBlockAccess {
+@@ -1327,8 +1336,11 @@ public abstract class World implements IBlockAccess {
  
              if (!tileentity.r() && tileentity.o() && this.isLoaded(tileentity.x, tileentity.y, tileentity.z)) {
                  try {
@@ -334,7 +334,7 @@ index 6d59bc3..feb657b 100644
                      crashreport = CrashReport.a(throwable2, "Ticking tile entity");
                      crashreportsystemdetails = crashreport.a("Tile entity being ticked");
                      tileentity.a(crashreportsystemdetails);
-@@ -1354,6 +1366,8 @@ public abstract class World implements IBlockAccess {
+@@ -1348,6 +1360,8 @@ public abstract class World implements IBlockAccess {
              }
          }
  
@@ -343,7 +343,7 @@ index 6d59bc3..feb657b 100644
          this.N = false;
          if (!this.b.isEmpty()) {
              this.tileEntityList.removeAll(this.b);
-@@ -1392,6 +1406,7 @@ public abstract class World implements IBlockAccess {
+@@ -1386,6 +1400,7 @@ public abstract class World implements IBlockAccess {
              this.a.clear();
          }
  
@@ -351,7 +351,7 @@ index 6d59bc3..feb657b 100644
          this.methodProfiler.b();
          this.methodProfiler.b();
      }
-@@ -1414,6 +1429,7 @@ public abstract class World implements IBlockAccess {
+@@ -1408,6 +1423,7 @@ public abstract class World implements IBlockAccess {
          byte b0 = 32;
  
          if (!flag || this.e(i - b0, 0, j - b0, i + b0, 0, j + b0)) {
@@ -359,7 +359,7 @@ index 6d59bc3..feb657b 100644
              entity.U = entity.locX;
              entity.V = entity.locY;
              entity.W = entity.locZ;
-@@ -1475,6 +1491,7 @@ public abstract class World implements IBlockAccess {
+@@ -1469,6 +1485,7 @@ public abstract class World implements IBlockAccess {
                      entity.passenger = null;
                  }
              }

CraftBukkit-Patches/0018-Orebfuscator.patch

@@ -1,4 +1,4 @@
-From d1fcdee476dc06ec97df4aa445aec79a4de1b486 Mon Sep 17 00:00:00 2001
+From dfdd8f8a4b40910948d7ea205bf1be8027e750c5 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 16 May 2013 18:51:05 +1000
 Subject: [PATCH] Orebfuscator

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

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

@@ -1,14 +1,14 @@
-From 87d0081d8e90fbc40cba4e35318a5102c55b8c55 Mon Sep 17 00:00:00 2001
+From f736edc2aec1807e16d2cedb7cbcdd9fded97dfe 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 feb657b..c547ecc 100644
+index 130d948..5eab968 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 {
+@@ -1327,6 +1327,13 @@ public abstract class World implements IBlockAccess {
  
          while (iterator.hasNext()) {
              TileEntity tileentity = (TileEntity) iterator.next();

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

@@ -1,4 +1,4 @@
-From 06b281d89b82328a5cfd0296df327f2a0b580aff Mon Sep 17 00:00:00 2001
+From d257c428c507b6c2904cedec0a70e8876aeda20b 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
@@ -118,7 +118,7 @@ index 58a4acb..35f3fea 100644
      public EntityLiving(World world) {
          super(world);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index c547ecc..64c7c85 100644
+index 5eab968..fa7ca31 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -13,6 +13,7 @@ import java.util.concurrent.Callable;
@@ -129,7 +129,7 @@ index c547ecc..64c7c85 100644
  import org.bukkit.craftbukkit.SpigotTimings; // Spigot
  import org.bukkit.craftbukkit.util.UnsafeList;
  import org.bukkit.generator.ChunkGenerator;
-@@ -1275,6 +1276,7 @@ public abstract class World implements IBlockAccess {
+@@ -1269,6 +1270,7 @@ public abstract class World implements IBlockAccess {
          this.f.clear();
          this.methodProfiler.c("regular");
  
@@ -137,7 +137,7 @@ index c547ecc..64c7c85 100644
          timings.entityTick.startTiming(); // Spigot
          for (i = 0; i < this.entityList.size(); ++i) {
              entity = (Entity) this.entityList.get(i);
-@@ -1435,8 +1437,13 @@ public abstract class World implements IBlockAccess {
+@@ -1429,8 +1431,13 @@ public abstract class World implements IBlockAccess {
          int j = MathHelper.floor(entity.locZ);
          byte b0 = 32;
  

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

@@ -1,4 +1,4 @@
-From 9839d0e5d738d17736f9e839e034999686cf760d Mon Sep 17 00:00:00 2001
+From 67ecf477dd455779e5e63f6338c558f9c1deae2d 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/0023-Watchdog-Thread.patch

@@ -1,4 +1,4 @@
-From 98eafd828ed35776a1ae6ecce1d2e2136f271a34 Mon Sep 17 00:00:00 2001
+From 047eb8fcd54deba4c619979f82c098dae103470d 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/0024-Netty.patch

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

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

@@ -1,4 +1,4 @@
-From 8d19c5f1c4232cd0857ec9277e601b41000c9915 Mon Sep 17 00:00:00 2001
+From bac8e9a1cb074e3b1372ff7fa43208d0e26404c9 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/0026-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch

@@ -1,4 +1,4 @@
-From 5a119c90b95a42f108d8f8160839e3d3e4a1803f Mon Sep 17 00:00:00 2001
+From cbd22e660152b5f0bef15eebab9af459fce72f3c 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/0027-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch

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

@@ -1,4 +1,4 @@
-From 626c4aad5b26ebcf6e623fcb0e999bf45109fa69 Mon Sep 17 00:00:00 2001
+From 4482fdec4e94253ea6af824e17ed396b8735fc31 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/0029-PlayerItemDamageEvent.patch

@@ -1,4 +1,4 @@
-From 111e5597920a67e93fb8a16c62b747c6628e6679 Mon Sep 17 00:00:00 2001
+From 9decd372b4a65a178787e658b3b5e268ec83177c 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/0030-Faster-UUID-for-entities.patch

@@ -1,4 +1,4 @@
-From 76e2cfc3ac94e006a8d74a7f1fa3209e79336f5c Mon Sep 17 00:00:00 2001
+From 565c13d6f1ac6fc03d34e39163f6fe8f21d158e0 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/0031-Prevent-NPE-in-CraftSign.patch

@@ -1,4 +1,4 @@
-From 211d7fed6c5a0f051b71d671d651e8aea8583b68 Mon Sep 17 00:00:00 2001
+From 5e8a1f05cf269f26c87bb288054362e9b0abdfc5 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/0032-Stage-DataWatcher-WatchableObject.patch

@@ -1,4 +1,4 @@
-From 9a9a16e61b6fb3bb4f8d7cd3f2a9d05795c5f437 Mon Sep 17 00:00:00 2001
+From b0934ffb7b6ee6497732222977ed9e7eaa123ef0 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/0033-Entity-Tracking-Ranges.patch

@@ -1,4 +1,4 @@
-From 2457a6f9b8e0772669d937d137aadcb4999887c8 Mon Sep 17 00:00:00 2001
+From a4ade6750e45f2f265bba77bca5655ce82c88379 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/0034-BungeeCord-Support.patch

@@ -1,4 +1,4 @@
-From a8e6cf9ae9dfc0b75f32d3938fcc13a6e454b31c Mon Sep 17 00:00:00 2001
+From 1904d309995de486bde6ba0da4b8a2567c259aa3 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/0035-Texture-Pack-Resolutions.patch

@@ -1,4 +1,4 @@
-From 41417b5e0d7636ce9190efd39eda506616c688ae Mon Sep 17 00:00:00 2001
+From 95da26c65f852e9f3996915e09bd3617787fcf13 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/0036-Limit-Custom-Map-Rendering.patch

@@ -1,4 +1,4 @@
-From bf85ea164d7cfbaa34ea05c1dcca438a2597f932 Mon Sep 17 00:00:00 2001
+From 6410dc7972211a5c3dba85c2a1c22bf6ef69ce34 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/0037-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch

@@ -1,4 +1,4 @@
-From 13dd8ea7ee00ede17a97035e436366f1449b46b5 Mon Sep 17 00:00:00 2001
+From 64a983b96d9fe0e778c9bf6fec6bad1e3fca07ee 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/0038-Enable-Improved-ping-sending.patch

@@ -1,4 +1,4 @@
-From 627ec65c6d5dd38514047c86a97e3e7b3264ad8a Mon Sep 17 00:00:00 2001
+From 003586da7abd77f3d78c9f93490740e7badf70d9 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/0039-Prevent-handshake-spam-from-invalid-names.patch

@@ -1,4 +1,4 @@
-From 81f88d23c1dcc15e62eb9fcb97342102fd31365d Mon Sep 17 00:00:00 2001
+From c1eeeb08e3a00a2a2c53684ebfdcf9f87d6eb72a 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/0040-Save-entity-counts-for-randomly-spawned-creatures-to.patch

@@ -1,4 +1,4 @@
-From a34377aa0ddc9cdabd9e41f857c8bfde6ebdc6f5 Mon Sep 17 00:00:00 2001
+From 2f6da6dc58168d000771c0d960755451cc2dea81 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/0041-Thread-Naming-and-Tweaks.patch

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

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

@@ -1,4 +1,4 @@
-From c145a0a19efdef87145f09ef3a6f1bb4958f77d1 Mon Sep 17 00:00:00 2001
+From 6b9bc24985f9e02501c20faa856bcb97cd03ea69 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/0043-Optimized-version-of-LocaleLanguage.patch

@@ -1,4 +1,4 @@
-From 5076b8f71c5aa46eef3d3bcc734741f271677cd7 Mon Sep 17 00:00:00 2001
+From 981fe82c7589948286c156d36d8e1389504e0dd1 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/0044-Improve-next-tick-list-performance-on-chunk-unloads-.patch

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

CraftBukkit-Patches/0045-Remove-o-Option.patch

@@ -1,4 +1,4 @@
-From fc463031676c11d34103f0bdf84995b05f18dc2f Mon Sep 17 00:00:00 2001
+From 00ac7e5dcecf370c6b0a27efd7616dcf048148ce Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 19 May 2013 18:29:48 +1000
 Subject: [PATCH] Remove -o Option

CraftBukkit-Patches/0046-Recipe-Deconstruction.patch

@@ -1,4 +1,4 @@
-From 89a379ee320a63bcb60b259318c8b2535ffa54d5 Mon Sep 17 00:00:00 2001
+From 77e1bf77dd51af965b6ef71cf3879ee2d9f44c35 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 1 Jun 2013 16:34:38 +1000
 Subject: [PATCH] Recipe Deconstruction

CraftBukkit-Patches/0047-Fix-Health-Scaling.patch

@@ -1,4 +1,4 @@
-From b8d7cd050a8307a8acdc2d0d3fcc0dbad25fe29f Mon Sep 17 00:00:00 2001
+From beb2f19a478943f62747d6ec188220391db36904 Mon Sep 17 00:00:00 2001
 From: Nick Minkler <sleaker@gmail.com>
 Date: Sun, 2 Jun 2013 14:54:11 +1000
 Subject: [PATCH] Fix Health Scaling

CraftBukkit-Patches/0048-Fix-EntityShootBowEvent-with-Skeletons.patch

@@ -1,4 +1,4 @@
-From 050cf2918a4a0d2b62d2aa2baf727e2c38e5820b Mon Sep 17 00:00:00 2001
+From 08ae7b4f283c01804d1ed35b480ae3f13e0106cb Mon Sep 17 00:00:00 2001
 From: Nick Minkler <sleaker@gmail.com>
 Date: Sun, 2 Jun 2013 15:04:37 +1000
 Subject: [PATCH] Fix EntityShootBowEvent with Skeletons

CraftBukkit-Patches/0049-Implement-Arrow-API.patch

@@ -1,4 +1,4 @@
-From 322af2ad092cd8ad39a1d82454d7b0186e8a2553 Mon Sep 17 00:00:00 2001
+From 238ce0151639dd4ae8f5b1ec9947344e4ad2eb57 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:16:05 +1000
 Subject: [PATCH] Implement Arrow API

CraftBukkit-Patches/0050-Particle-API.patch

@@ -1,4 +1,4 @@
-From 3667861408f4060846b4e5faa62b74a6e82f73b2 Mon Sep 17 00:00:00 2001
+From 1a85210af49a095faee82ac64512518a7dff9b53 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 16:14:30 +1000
 Subject: [PATCH] Particle API

CraftBukkit-Patches/0051-Hopper-Cooldowns.patch

@@ -1,4 +1,4 @@
-From 028837b3b8f3dfb6d2f290de6cea6cd645b07455 Mon Sep 17 00:00:00 2001
+From 5c6a727485881ecce2fd1c18b248cd3716e6476b Mon Sep 17 00:00:00 2001
 From: DerFlash <bte@freenet.de>
 Date: Sun, 2 Jun 2013 16:23:46 +1000
 Subject: [PATCH] Hopper Cooldowns

CraftBukkit-Patches/0052-Prevent-Shutdown-Hang.patch

@@ -1,4 +1,4 @@
-From d8ae55e32ccec6edd8a777375731a69f7b310649 Mon Sep 17 00:00:00 2001
+From 19b5dbf8e6b8a006cbc7820eda9788583ab28a41 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 11 Jun 2013 11:54:32 +1000
 Subject: [PATCH] Prevent Shutdown Hang