diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java
index dd00660780..eb53032b21 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java
@@ -255,10 +255,7 @@ public boolean hasProperty(PropertyKey key) {
      */
     public boolean hasProperty(Property<?> property) {
         int ordinal = property.getKey().getId();
-        Property<?> selfProperty;
-        return this.settings.propertiesMapArr.length > ordinal
-                && (selfProperty = this.settings.propertiesMapArr[ordinal]) != null
-                && selfProperty == property;
+        return this.settings.propertiesMapArr.length > ordinal && property.equals(this.settings.propertiesMapArr[ordinal]);
     }
 
     public <V> Property<V> getProperty(PropertyKey key) {