diff --git a/src/main/java/com/sk89q/worldedit/blocks/BaseBlock.java b/src/main/java/com/sk89q/worldedit/blocks/BaseBlock.java
index 7cd2eecc6..7c9048d64 100644
--- a/src/main/java/com/sk89q/worldedit/blocks/BaseBlock.java
+++ b/src/main/java/com/sk89q/worldedit/blocks/BaseBlock.java
@@ -140,7 +140,12 @@ public class BaseBlock extends Block {
             return false;
         }
 
-        return getType() == ((BaseBlock) o).getType() && getData() == ((BaseBlock) o).getData();
+        final BaseBlock otherBlock = (BaseBlock) o;
+        if (getType() != otherBlock.getType()) {
+            return false;
+        }
+
+        return getData() == otherBlock.getData();
     }
 
     /**