diff --git a/src/main/java/net/minecraft/server/BlockHopper.java b/src/main/java/net/minecraft/server/BlockHopper.java
index 8732702112..d1fd0755b9 100644
--- a/src/main/java/net/minecraft/server/BlockHopper.java
+++ b/src/main/java/net/minecraft/server/BlockHopper.java
@@ -145,7 +145,7 @@ public class BlockHopper extends BlockContainer {
     }
 
     public static int c(int i) {
-        return i & 7;
+        return Math.min(i & 7, 5); // CraftBukkit - Fix AIOOBE in callers
     }
 
     public static boolean d(int i) {