TestblockReset #247
@ -40,8 +40,6 @@ import org.bukkit.Bukkit;
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.IOException;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashSet;
|
||||
import java.util.Objects;
|
||||
|
||||
class Region_15 {
|
||||
@ -78,7 +76,7 @@ class Region_15 {
|
||||
if (pasteOptions.isReset()) {
|
||||
e.setBlocks(new CuboidRegion(RegionUtils_15.toBlockVector3(pasteOptions.getMinPoint()), RegionUtils_15.toBlockVector3(pasteOptions.getMaxPoint())), BlockTypes.AIR.getDefaultState().toBaseBlock());
|
||||
if (pasteOptions.getWaterLevel() != 0) {
|
||||
System.out.println(e.setBlocks(new CuboidRegion(RegionUtils_15.toBlockVector3(pasteOptions.getMinPoint()), RegionUtils_15.toBlockVector3(pasteOptions.getMaxPoint()).withY(pasteOptions.getWaterLevel())), BlockTypes.WATER.getDefaultState().toBaseBlock()));
|
||||
e.setBlocks(new CuboidRegion(RegionUtils_15.toBlockVector3(pasteOptions.getMinPoint()), RegionUtils_15.toBlockVector3(pasteOptions.getMaxPoint()).withY(pasteOptions.getWaterLevel())), BlockTypes.WATER.getDefaultState().toBaseBlock());
|
||||
}
|
||||
}
|
||||
Operations.completeBlindly(ch.createPaste(e).to(v).ignoreAirBlocks(pasteOptions.isIgnoreAir()).build());
|
||||
|
@ -64,12 +64,12 @@ public class CommandTestblock extends SWCommand {
|
||||
}
|
||||
|
||||
|
||||
@Register
|
||||
@Register({"schem"})
|
||||
public void schematicTestblockCommand(Player p, String s) {
|
||||
schematicTestblockCommand(p, s, RegionExtensionType.NORMAL);
|
||||
}
|
||||
|
||||
@Register
|
||||
@Register({"schem"})
|
||||
public void schematicTestblockCommand(Player p, String s, RegionExtensionType regionExtensionType) {
|
||||
if (!permissionCheck(p)) return;
|
||||
Region region = regionCheck(p);
|
||||
|
@ -21,6 +21,7 @@ package de.steamwar.bausystem.world.regions;
|
||||
|
||||
import com.sk89q.worldedit.EditSession;
|
||||
import com.sk89q.worldedit.extent.clipboard.Clipboard;
|
||||
import de.steamwar.bausystem.BauSystem;
|
||||
import de.steamwar.bausystem.world.Color;
|
||||
import de.steamwar.core.VersionedCallable;
|
||||
import de.steamwar.sql.NoClipboardException;
|
||||
@ -186,7 +187,7 @@ public class Prototype {
|
||||
}
|
||||
|
||||
public EditSession resetTestblock(Region region, Schematic schem, Color color, boolean reset) throws IOException, NoClipboardException {
|
||||
return testblock.reset(region, schem, false, color, reset);
|
||||
return testblock.reset(region, schem, false, color, reset && waterLevel == 0);
|
||||
}
|
||||
|
||||
private static boolean inRange(double l, int min, int size) {
|
||||
|
In neuem Issue referenzieren
Einen Benutzer sperren