Upstream merge

Bukkit

@@ -1 +1 @@
-Subproject commit 4a47cf3e83dce057525d4204549ee60d4ba59e66
+Subproject commit 55c8f0a007ff851787dc8672a53763f6039d4cac

CraftBukkit

@@ -1 +1 @@
-Subproject commit 13c4801339156a8663a9f034b120be9711e5bebd
+Subproject commit a66265835eaa9f3dff4609ecae37519f646fad10

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;

CraftBukkit-Patches/0124-Fix-missed-diff-in-TileEntityHopper.patch

@@ -1,22 +0,0 @@
-From bac29928953da2120a3ed79f9404d7495a44f29b Mon Sep 17 00:00:00 2001
-From: Thinkofdeath <thethinkofdeath@gmail.com>
-Date: Mon, 24 Mar 2014 11:59:59 +0000
-Subject: [PATCH] Fix missed diff in TileEntityHopper
-
-
-diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
-index 8ace84f..fed4ece 100644
---- a/src/main/java/net/minecraft/server/TileEntityHopper.java
-+++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
-@@ -265,7 +265,7 @@ public class TileEntityHopper extends TileEntity implements IHopper {
-                         InventoryMoveItemEvent event = new InventoryMoveItemEvent(this.getOwner().getInventory(), oitemstack.clone(), destinationInventory, true);
-                         this.getWorld().getServer().getPluginManager().callEvent(event);
-                         if (event.isCancelled()) {
--                            this.setItem(i, itemstack);
-+                            this.setItem(j, itemstack); // Spigot i -> j
-                             this.c(world.spigotConfig.hopperTransfer); // Spigot
-                             return false;
-                         }
--- 
-1.8.5.2.msysgit.0
-