diff --git a/CraftBukkit-Patches/0025-Hopper-Customisations.patch b/CraftBukkit-Patches/0025-Hopper-Customisations.patch
index d22b0fec4..e987b3015 100644
--- a/CraftBukkit-Patches/0025-Hopper-Customisations.patch
+++ b/CraftBukkit-Patches/0025-Hopper-Customisations.patch
@@ -1,4 +1,4 @@
-From d6d400e05c13b2b5b7937d4bd63a336fe3a482ea Mon Sep 17 00:00:00 2001
+From 0f91425387db073b54c0912285eb5fdc36afc681 Mon Sep 17 00:00:00 2001
 From: erocs <github@erocs.org>
 Date: Sun, 8 Sep 2013 12:06:15 -0700
 Subject: [PATCH] Hopper Customisations
@@ -6,10 +6,10 @@ Subject: [PATCH] Hopper Customisations
 Allows editing hopper cooldowns and amount transferred per tick.
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
-index 72d067a..b3bf687 100644
+index 72d067a..8e0d254 100644
 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java
 +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
-@@ -194,12 +194,18 @@ public class TileEntityHopper extends TileEntityContainer implements IHopper, IU
+@@ -194,12 +194,11 @@ public class TileEntityHopper extends TileEntityContainer implements IHopper, IU
                  }
  
                  if (flag) {
@@ -19,17 +19,11 @@ index 72d067a..b3bf687 100644
                      return true;
                  }
              }
- 
-+            // Spigot start
-+            if ( !this.n() )
-+            {
-+                this.d( world.spigotConfig.hopperCheck );
-+            }
-+            // Spigot end
+-
              return false;
          } else {
              return false;
-@@ -253,7 +259,7 @@ public class TileEntityHopper extends TileEntityContainer implements IHopper, IU
+@@ -253,7 +252,7 @@ public class TileEntityHopper extends TileEntityContainer implements IHopper, IU
                          // ItemStack itemstack1 = addItem(iinventory, this.splitStack(i, 1), enumdirection);
  
                          // CraftBukkit start - Call event when pushing items into other inventories
@@ -38,7 +32,7 @@ index 72d067a..b3bf687 100644
  
                          Inventory destinationInventory;
                          // Have to special case large chests as they work oddly
-@@ -267,9 +273,10 @@ public class TileEntityHopper extends TileEntityContainer implements IHopper, IU
+@@ -267,9 +266,10 @@ public class TileEntityHopper extends TileEntityContainer implements IHopper, IU
                          this.getWorld().getServer().getPluginManager().callEvent(event);
                          if (event.isCancelled()) {
                              this.setItem(i, itemstack);
@@ -50,7 +44,7 @@ index 72d067a..b3bf687 100644
                          ItemStack itemstack1 = addItem(iinventory, CraftItemStack.asNMSCopy(event.getItem()), enumdirection);
  
                          if (itemstack1 == null || itemstack1.count == 0) {
-@@ -281,7 +288,7 @@ public class TileEntityHopper extends TileEntityContainer implements IHopper, IU
+@@ -281,7 +281,7 @@ public class TileEntityHopper extends TileEntityContainer implements IHopper, IU
                              // CraftBukkit end
                              return true;
                          }
@@ -59,7 +53,7 @@ index 72d067a..b3bf687 100644
                          this.setItem(i, itemstack);
                      }
                  }
-@@ -391,7 +398,7 @@ public class TileEntityHopper extends TileEntityContainer implements IHopper, IU
+@@ -391,7 +391,7 @@ public class TileEntityHopper extends TileEntityContainer implements IHopper, IU
              ItemStack itemstack1 = itemstack.cloneItemStack();
              // ItemStack itemstack2 = addItem(ihopper, iinventory.splitStack(i, 1), (EnumDirection) null);
              // CraftBukkit start - Call event on collection of items from inventories into the hopper
@@ -68,7 +62,7 @@ index 72d067a..b3bf687 100644
  
              Inventory sourceInventory;
              // Have to special case large chests as they work oddly
-@@ -408,13 +415,13 @@ public class TileEntityHopper extends TileEntityContainer implements IHopper, IU
+@@ -408,13 +408,13 @@ public class TileEntityHopper extends TileEntityContainer implements IHopper, IU
                  iinventory.setItem(i, itemstack1);
  
                  if (ihopper instanceof TileEntityHopper) {
@@ -85,7 +79,7 @@ index 72d067a..b3bf687 100644
              ItemStack itemstack2 = addItem(ihopper, CraftItemStack.asNMSCopy(event.getItem()), null);
  
              if (itemstack2 == null || itemstack2.count == 0) {
-@@ -426,6 +433,7 @@ public class TileEntityHopper extends TileEntityContainer implements IHopper, IU
+@@ -426,6 +426,7 @@ public class TileEntityHopper extends TileEntityContainer implements IHopper, IU
                  // CraftBukkit end
                  return true;
              }
@@ -93,7 +87,7 @@ index 72d067a..b3bf687 100644
  
              iinventory.setItem(i, itemstack1);
          }
-@@ -515,7 +523,7 @@ public class TileEntityHopper extends TileEntityContainer implements IHopper, IU
+@@ -515,7 +516,7 @@ public class TileEntityHopper extends TileEntityContainer implements IHopper, IU
                      TileEntityHopper tileentityhopper = (TileEntityHopper) iinventory;
  
                      if (tileentityhopper.o()) {
diff --git a/CraftBukkit-Patches/0091-Prevent-hoppers-from-loading-chunks.patch b/CraftBukkit-Patches/0091-Prevent-hoppers-from-loading-chunks.patch
index 8ecf7eee6..cbb918ec2 100644
--- a/CraftBukkit-Patches/0091-Prevent-hoppers-from-loading-chunks.patch
+++ b/CraftBukkit-Patches/0091-Prevent-hoppers-from-loading-chunks.patch
@@ -1,14 +1,14 @@
-From d9513bec77e7242331a32c4e6170e2c4d65fbc3f Mon Sep 17 00:00:00 2001
+From 195d4b014983c65cf651f8247fa3990f86ee9f92 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 b3bf687..4f50a47 100644
+index 8e0d254..766f74e 100644
 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java
 +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
-@@ -556,6 +556,7 @@ public class TileEntityHopper extends TileEntityContainer implements IHopper, IU
+@@ -549,6 +549,7 @@ public class TileEntityHopper extends TileEntityContainer implements IHopper, IU
          int j = MathHelper.floor(d1);
          int k = MathHelper.floor(d2);
          BlockPosition blockposition = new BlockPosition(i, j, k);