# Conflicts:
#	BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java

@@ -175,0 +159,4 @@
+                public boolean test(BlockVector3 blockVector3) {
+                    BaseBlock block = clipboard.getFullBlock(blockVector3);
+                    String blockName = block.toString().toLowerCase();
+                    if (pasteOptions.isTestBlock() && blockName.equals("minecraft.water")) return true;

@@ -42,10 +42,12 @@ import com.sk89q.worldedit.regions.selector.CuboidRegionSelector;
 import com.sk89q.worldedit.session.ClipboardHolder;
 import com.sk89q.worldedit.world.World;
 import com.sk89q.worldedit.world.block.BaseBlock;
+import com.sk89q.worldedit.world.block.BlockState;

@@ -46,3 +47,4 @@
 import de.steamwar.bausystem.region.Color;
 import de.steamwar.bausystem.region.PasteOptions;
 import de.steamwar.bausystem.region.Point;
+import net.minecraft.server.v1_15_R1.AreaFactory;

@@ -147,0 +146,4 @@
+
+
+            Set<String> blocks = new HashSet<>();
+            {

@@ -162,0 +169,4 @@
+                    if (blocks.contains(blockName) && pasteOptions.isOnlyColors()) return true;
+                    if (pasteOptions.isTestBlock()) {
+                        if (blockName.startsWith("minecraft:water")) return false;
+                        if (block.toString().toLowerCase().contains("waterlogged=true")) return false;

@@ -58,3 +58,3 @@
         if (region == null) return;
         try {
-            region.reset(RegionType.TESTBLOCK, regionExtensionType);
+            region.reset(RegionType.TESTBLOCK, regionExtensionType, true);

@@ -87,3 +87,3 @@
 
         try {
-            region.reset(node, RegionType.TESTBLOCK, regionExtensionType);
+            region.reset(node, RegionType.TESTBLOCK, regionExtensionType, true);

@@ -68,2 +68,4 @@
 	 */
 	private final int waterLevel;
+
+	private final boolean testBlock;

@@ -423,3 +423,3 @@
 
     public void reset(RegionType regionType, RegionExtensionType regionExtensionType) throws IOException {
-        reset(null, regionType, regionExtensionType, false);
+        reset(null, regionType, regionExtensionType);

@@ -448,3 +448,3 @@
         }
 
-        PasteOptions pasteOptions = new PasteOptions((schematic != null && (schematic.getSchemtype().fightType() || schematic.getSchemtype().check())), ignoreAir, getPlain(Flag.COLOR, ColorMode.class).getColor(), onlyColors, regionExtensionType == RegionExtensionType.EXTENSION, getMinPoint(regionType, regionExtensionType), getMaxPoint(regionType, regionExtensionType), waterLevel);
+        PasteOptions pasteOptions = new PasteOptions((schematic != null && (schematic.getSchemtype().fightType() || schematic.getSchemtype().check())), ignoreAir, getPlain(Flag.COLOR, ColorMode.class).getColor(), onlyColors, regionExtensionType == RegionExtensionType.EXTENSION, getMinPoint(regionType, regionExtensionType), getMaxPoint(regionType, regionExtensionType), waterLevel, isTestBlock);