diff --git a/src/main/java/net/minecraft/server/BlockPistonExtension.java b/src/main/java/net/minecraft/server/BlockPistonExtension.java
index 289671756c..19ec8d5d4d 100644
--- a/src/main/java/net/minecraft/server/BlockPistonExtension.java
+++ b/src/main/java/net/minecraft/server/BlockPistonExtension.java
@@ -15,7 +15,7 @@ public class BlockPistonExtension extends Block {
 
     public void remove(World world, int i, int j, int k, int l, int i1) {
         super.remove(world, i, j, k, l, i1);
-        if (i1 > 5 || i1 < 0) return; // CraftBukkit - fixed a piston AIOOBE issue
+        if ((i1 & 7) >= Facing.OPPOSITE_FACING.length) return; // CraftBukkit - fixed a piston AIOOBE issue
         int j1 = Facing.OPPOSITE_FACING[f(i1)];
 
         i += Facing.b[j1];
@@ -142,7 +142,7 @@ public class BlockPistonExtension extends Block {
 
     public void doPhysics(World world, int i, int j, int k, int l) {
         int i1 = f(world.getData(i, j, k));
-        if (i1 > 5 || i1 < 0) return; // CraftBukkit - fixed a piston AIOOBE issue
+        if ((i1 & 7) >= Facing.OPPOSITE_FACING.length) return; // CraftBukkit - fixed a piston AIOOBE issue
         int j1 = world.getTypeId(i - Facing.b[i1], j - Facing.c[i1], k - Facing.d[i1]);
 
         if (j1 != Block.PISTON.id && j1 != Block.PISTON_STICKY.id) {