From 8a425cc435542e1d2280b54b1b304833ab6baccd Mon Sep 17 00:00:00 2001
From: BuildTools <unconfigured@null.spigotmc.org>
Date: Sat, 4 Feb 2023 11:26:50 +0100
Subject: [PATCH] Prevent Water from being pasted using /tb <schem>

---
 .../bausystem/utils/FlatteningWrapper15.java  | 50 +++++++++----------
 1 file changed, 23 insertions(+), 27 deletions(-)

diff --git a/BauSystem_15/src/de/steamwar/bausystem/utils/FlatteningWrapper15.java b/BauSystem_15/src/de/steamwar/bausystem/utils/FlatteningWrapper15.java
index cadcb72a..52fd6a92 100644
--- a/BauSystem_15/src/de/steamwar/bausystem/utils/FlatteningWrapper15.java
+++ b/BauSystem_15/src/de/steamwar/bausystem/utils/FlatteningWrapper15.java
@@ -142,36 +142,32 @@ public class FlatteningWrapper15 implements FlatteningWrapper {
             if (pasteOptions.getColor() != Color.YELLOW) {
                 changeColor(clipboard, pasteOptions.getColor());
             }
-            if (pasteOptions.isOnlyColors()) {
-                Set<String> blocks = new HashSet<>();
-                blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_wool");
-                blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_terracotta");
-                blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_glazed_terracotta");
-                blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_stained_glass");
-                blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_stained_glass_pane");
-                blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_concrete");
-                blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_concrete_powder");
-                blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_carpet");
-
-                e.setMask(new Mask() {
-                    @Override
-                    public boolean test(BlockVector3 blockVector3) {
-                        BaseBlock block = clipboard.getFullBlock(blockVector3);
-                        String blockName = block.toString().toLowerCase();
-                        return blocks.contains(blockName);
+            e.setMask(new Mask() {
+                @Override
+                public boolean test(BlockVector3 blockVector3) {
+                    Set<String> blocks = new HashSet<>();
+                    if (pasteOptions.isOnlyColors()) {
+                        blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_wool");
+                        blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_terracotta");
+                        blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_glazed_terracotta");
+                        blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_stained_glass");
+                        blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_stained_glass_pane");
+                        blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_concrete");
+                        blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_concrete_powder");
+                        blocks.add("minecraft:" + pasteOptions.getColor().name().toLowerCase() + "_carpet");
                     }
 
-                    @Nullable
-                    @Override
-                    public Mask2D toMask2D() {
-                        return null;
-                    }
+                    BaseBlock block = clipboard.getFullBlock(blockVector3);
+                    String blockName = block.toString().toLowerCase();
+                    return blockName.equals("minecraft:water") || blocks.contains(blockName);
+                }
 
-                    public Mask copy() {
-                        return this;
-                    }
-                });
-            }
+                @Nullable
+                @Override
+                public Mask2D toMask2D() {
+                    return null;
+                }
+            });
 
             ClipboardHolder ch = new ClipboardHolder(clipboard);
             BlockVector3 dimensions = clipboard.getDimensions();