diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 66938f6a96..b1d97e26ac 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1625,7 +1625,7 @@ public class World implements IBlockAccess {
         // CraftBukkit start - We dont want to allow the user to override the bounding box check
         boolean defaultReturn = axisalignedbb != null && !this.a(axisalignedbb) ? false : (block != Block.WATER && block != Block.STATIONARY_WATER && block != Block.LAVA && block != Block.STATIONARY_LAVA && block != Block.FIRE && block != Block.SNOW ? i > 0 && block == null && block1.a(this, j, k, l) : true);
 
-        if (!defaultReturn) {
+        if (axisalignedbb != null && !this.a(axisalignedbb)) {
             return false;
         }