Upstream merge

By: Thinkofdeath <thethinkofdeath@gmail.com>

CraftBukkit-Patches/0016-Handle-Null-Tile-Entities.patch

@@ -1,14 +1,14 @@
-From 1a7e92b8f083d819750ddabb094a5f6d16cdd77a Mon Sep 17 00:00:00 2001
+From f4eb04cc282a3a666f4e86bf088ba98aa0597eca 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] Handle Null Tile Entities
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f1bf467..5a368a0 100644
+index e64658d..99345a1 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1292,6 +1292,13 @@ public abstract class World implements IBlockAccess {
+@@ -1302,6 +1302,13 @@ public abstract class World implements IBlockAccess {
  
          while (iterator.hasNext()) {
              TileEntity tileentity = (TileEntity) iterator.next();
@@ -23,5 +23,5 @@ index f1bf467..5a368a0 100644
              ChunkProviderServer chunkProviderServer = ((WorldServer) this).chunkProviderServer;
              if (chunkProviderServer.unloadQueue.contains(tileentity.x >> 4, tileentity.z >> 4)) {
 -- 
-1.8.3.2
+1.8.4.msysgit.0