Upstream merge

By: Thinkofdeath <thethinkofdeath@gmail.com>

CraftBukkit-Patches/0030-Hopper-Cooldowns.patch

@@ -1,11 +1,11 @@
-From 2103d841de6a2f21e9a850e70eb5b286131281c2 Mon Sep 17 00:00:00 2001
+From 01703d660a5e7114805f47fd40126f50d895e438 Mon Sep 17 00:00:00 2001
 From: erocs <github@erocs.org>
 Date: Sun, 8 Sep 2013 12:06:15 -0700
 Subject: [PATCH] Hopper Cooldowns
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
-index 563d9c8..a19863a 100644
+index 3f1a910..d7a3178 100644
 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java
 +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
 @@ -189,12 +189,18 @@ public class TileEntityHopper extends TileEntity implements IHopper {
@@ -31,7 +31,7 @@ index 563d9c8..a19863a 100644
 @@ -260,7 +266,7 @@ public class TileEntityHopper extends TileEntity implements IHopper {
                          this.getWorld().getServer().getPluginManager().callEvent(event);
                          if (event.isCancelled()) {
-                             this.setItem(i, itemstack);
+                             this.setItem(j, itemstack);
 -                            this.c(8); // Delay hopper checks
 +                            this.c(world.spigotConfig.hopperTransfer); // Spigot
                              return false;