Allow //replace to ignore from block damage values (and force them to not be ignored with the -f flag)

2011-09-17 21:50:06 -07:00
parent 56fd654eed
commit a1cf6eb6da
5 changed files with 30 additions and 10 deletions
--- a/src/main/java/com/sk89q/worldedit/blocks/BaseBlock.java
+++ b/src/main/java/com/sk89q/worldedit/blocks/BaseBlock.java
@@ -129,7 +129,8 @@ public class BaseBlock {
        if (!(o instanceof BaseBlock)) {
            return false;
        }
-        return (type == ((BaseBlock)o).type) && (data == ((BaseBlock)o).data);
+        return (type == ((BaseBlock)o).type)
+                && (data == ((BaseBlock)o).data || data == -1 || ((BaseBlock)o).data == -1);
    }
    
    @Override