Upstream merge, lots of conflicts

By: md_5 <git@md-5.net>

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

@@ -1,14 +1,14 @@
-From d1136b68975bc071ece95a4691de2aac820264e7 Mon Sep 17 00:00:00 2001
+From 12c06cd7b3eb049c7e2a170566a9f72c96f29d17 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 6946e31..e0daffb 100644
+index 40a3fcf..3e93cfd 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1377,6 +1377,13 @@ public abstract class World implements IBlockAccess {
+@@ -1374,6 +1374,13 @@ public abstract class World implements IBlockAccess {
  
          while (iterator.hasNext()) {
              TileEntity tileentity = (TileEntity) iterator.next();
@@ -19,9 +19,9 @@ index 6946e31..e0daffb 100644
 +                continue;
 +            }
 +            // Spigot end
-             // CraftBukkit start - Don't tick entities in chunks queued for unload
-             ChunkProviderServer chunkProviderServer = ((WorldServer) this).chunkProviderServer;
-             if (chunkProviderServer.unloadQueue.contains(tileentity.x >> 4, tileentity.z >> 4)) {
+ 
+             if (!tileentity.r() && tileentity.o() && this.isLoaded(tileentity.x, tileentity.y, tileentity.z)) {
+                 try {
 -- 
 1.9.1