fix: correctly check for properties in thaw/snow (#2976)

dordsor21 · web-flow · commit d52e5b0970d9 · 2024-11-19T16:54:49.000+01:00
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java b/worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java
@@ -2788,7 +2788,7 @@ public int thaw(BlockVector3 position, double radius, int height)
                         if (setBlock(mutable, air)) {
                             if (y > getMinY()) {
                                 BlockState block = getBlock(mutable2);
-                                if (block.getStates().containsKey(snowy)) {
+                                if (block.getBlockType().hasProperty(snowy)) {
                                     if (setBlock(mutable2, block.with(snowy, false))) {
                                         affected++;
                                     }
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/block/SnowSimulator.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/block/SnowSimulator.java
@@ -26,11 +26,12 @@
 import com.sk89q.worldedit.registry.state.BooleanProperty;
 import com.sk89q.worldedit.registry.state.EnumProperty;
 import com.sk89q.worldedit.registry.state.Property;
+import com.sk89q.worldedit.world.block.BlockCategories;
 import com.sk89q.worldedit.world.block.BlockState;
+import com.sk89q.worldedit.world.block.BlockType;
 import com.sk89q.worldedit.world.block.BlockTypes;
 
 import java.util.Locale;
-import java.util.Map;
 
 public class SnowSimulator implements LayerFunction {
 
@@ -120,22 +121,19 @@ public boolean apply(BlockVector3 position, int depth) throws WorldEditException
                 abovePosition) > 10) {
             return false;
         } else if (!block.getBlockType().getMaterial().isFullCube()) {
-            Map<Property<?>, Object> states = block.getStates();
-            if (states.containsKey(slab) && block.getState(slab).equalsIgnoreCase("bottom")) {
+            BlockType type = block.getBlockType();
+            if (type.hasProperty(slab) && block.getState(slab).equalsIgnoreCase("bottom")) {
                 return false;
-            } else if (states.containsKey(trapdoorOpen) && states.containsKey(trapdoor) && (block.getState(trapdoorOpen)
-                    || block.getState(trapdoor).equalsIgnoreCase("bottom"))) {
+            } else if ((type.hasProperty(trapdoorOpen) && block.getState(trapdoorOpen)) ||
+                    (type.hasProperty(trapdoor) && block.getState(trapdoor).equalsIgnoreCase("bottom"))) {
                 return false;
-            } else if (states.containsKey(stair) && block.getState(stair).equalsIgnoreCase("bottom")) {
+            } else if (type.hasProperty(stair) && block.getState(stair).equalsIgnoreCase("bottom")) {
                 return false;
             } else {
                 return false;
             }
             //FAWE end
-        } else if (!block.getBlockType().id().toLowerCase(Locale.ROOT).contains("ice") && block
-                .getBlockType()
-                .getMaterial()
-                .isTranslucent()) {
+        } else if (!BlockCategories.SNOW_LAYER_CAN_SURVIVE_ON.contains(block.getBlockType())) {
             return false;
         }
 
@@ -144,14 +142,14 @@ public boolean apply(BlockVector3 position, int depth) throws WorldEditException
             // We've hit the highest layer (If it doesn't contain current + 2 it means it's 1 away from full)
             if (!snowLayersProperty.getValues().contains(currentHeight + 2)) {
                 if (this.extent.setBlock(abovePosition, snowBlock)) {
-                    if (block.getStates().containsKey(snowy)) {
+                    if (block.getBlockType().hasProperty(snowy)) {
                         this.extent.setBlock(position, block.with(snowy, true));
                     }
                     this.affected++;
                 }
             } else {
                 if (this.extent.setBlock(abovePosition, above.with(snowLayersProperty, currentHeight + 1))) {
-                    if (block.getStates().containsKey(snowy)) {
+                    if (block.getBlockType().hasProperty(snowy)) {
                         this.extent.setBlock(position, block.with(snowy, true));
                     }
                     this.affected++;
@@ -160,7 +158,7 @@ public boolean apply(BlockVector3 position, int depth) throws WorldEditException
             return false;
         }
         if (this.extent.setBlock(abovePosition, snow)) {
-            if (block.getStates().containsKey(snowy)) {
+            if (block.getBlockType().hasProperty(snowy)) {
                 this.extent.setBlock(position, block.with(snowy, true));
             }
             this.affected++;
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/registry/state/AbstractProperty.java b/worldedit-core/src/main/java/com/sk89q/worldedit/registry/state/AbstractProperty.java
@@ -140,10 +140,10 @@ public void setName(final String name) {
 
     @Override
     public boolean equals(Object obj) {
-        if (!(obj instanceof Property)) {
+        if (!(obj instanceof Property property)) {
             return false;
         }
-        return getName().equals(((Property<?>) obj).getName());
+        return getName().equals(property.getName()) && property.getValues().equals(getValues());
     }
     //FAWE end
 }
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockState.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockState.java
@@ -366,7 +366,7 @@ public <V> BlockState withProperties(final BlockState other) {
         BlockState newState = this;
         for (Property<?> prop : ot.getProperties()) {
             PropertyKey key = prop.getKey();
-            if (blockType.hasPropertyOfType(key, prop.getClass())) {
+            if (blockType.hasProperty(prop)) {
                 newState = newState.with(key, other.getState(key));
             }
         }
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
@@ -248,18 +248,14 @@ public boolean hasProperty(PropertyKey key) {
     }
 
     /**
-     * {@return whether this block type has a property with given key of the given type}
+     * {@return whether this block type has a given property}
      *
-     * @param key          the key identifying the property
-     * @param propertyType the expected type of the property
+     * @param property     the expected property
      * @since TODO
      */
-    public boolean hasPropertyOfType(PropertyKey key, Class<?> propertyType) {
-        int ordinal = key.getId();
-        Property<?> property;
-        return this.settings.propertiesMapArr.length > ordinal
-                && (property = this.settings.propertiesMapArr[ordinal]) != null
-                && property.getClass() == propertyType;
+    public boolean hasProperty(Property<?> property) {
+        int ordinal = property.getKey().getId();
+        return this.settings.propertiesMapArr.length > ordinal && property.equals(this.settings.propertiesMapArr[ordinal]);
     }
 
     public <V> Property<V> getProperty(PropertyKey key) {

Original file line number	Diff line number	Diff line change
`@@ -2788,7 +2788,7 @@ public int thaw(BlockVector3 position, double radius, int height)`
`2788`	`2788`	`if (setBlock(mutable, air)) {`
`2789`	`2789`	`if (y > getMinY()) {`
`2790`	`2790`	`BlockState block = getBlock(mutable2);`
`2791`		`- if (block.getStates().containsKey(snowy)) {`
	`2791`	`+ if (block.getBlockType().hasProperty(snowy)) {`
`2792`	`2792`	`if (setBlock(mutable2, block.with(snowy, false))) {`
`2793`	`2793`	`affected++;`
`2794`	`2794`	`}`
Original file line number	Diff line number	Diff line change
`@@ -140,10 +140,10 @@ public void setName(final String name) {`
`140`	`140`
`141`	`141`	`@Override`
`142`	`142`	`public boolean equals(Object obj) {`
`143`		`- if (!(obj instanceof Property)) {`
	`143`	`+ if (!(obj instanceof Property property)) {`
`144`	`144`	`return false;`
`145`	`145`	`}`
`146`		`- return getName().equals(((Property<?>) obj).getName());`
	`146`	`+ return getName().equals(property.getName()) && property.getValues().equals(getValues());`
`147`	`147`	`}`
`148`	`148`	`//FAWE end`
`149`	`149`	`}`
Original file line number	Diff line number	Diff line change
`@@ -366,7 +366,7 @@ public <V> BlockState withProperties(final BlockState other) {`
`366`	`366`	`BlockState newState = this;`
`367`	`367`	`for (Property<?> prop : ot.getProperties()) {`
`368`	`368`	`PropertyKey key = prop.getKey();`
`369`		`- if (blockType.hasPropertyOfType(key, prop.getClass())) {`
	`369`	`+ if (blockType.hasProperty(prop)) {`
`370`	`370`	`newState = newState.with(key, other.getState(key));`
`371`	`371`	`}`
`372`	`372`	`}`