Upstream merge, lots of conflicts

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

CraftBukkit-Patches/0105-Prevent-hoppers-from-loading-chunks.patch

@@ -0,0 +1,21 @@
+From 7afa8817c8280404791b8f3c917bec9929f52daf Mon Sep 17 00:00:00 2001
+From: Thinkofdeath <thethinkofdeath@gmail.com>
+Date: Wed, 5 Mar 2014 20:27:27 +0000
+Subject: [PATCH] Prevent hoppers from loading chunks
+
+
+diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
+index 51cbdad..b620394 100644
+--- a/src/main/java/net/minecraft/server/TileEntityHopper.java
++++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
+@@ -542,6 +542,7 @@ public class TileEntityHopper extends TileEntity implements IHopper {
+         int i = MathHelper.floor(d0);
+         int j = MathHelper.floor(d1);
+         int k = MathHelper.floor(d2);
++        if ( !world.isLoaded( i, j, k ) ) return null; // Spigot
+         TileEntity tileentity = world.getTileEntity(i, j, k);
+ 
+         if (tileentity != null && tileentity instanceof IInventory) {
+-- 
+1.9.1
+