SteamWar/BauSystem
Archiviert
13
0

RegionFix #240

Manuell gemergt
YoyoNow hat 34 Commits von RegionFix nach master 2021-04-05 16:57:57 +02:00 zusammengeführt
Nur Änderungen aus Commit a08c31c8b4 werden angezeigt - Alle Commits anzeigen

Datei anzeigen

@ -28,6 +28,9 @@ import de.steamwar.sql.NoClipboardException;
import de.steamwar.sql.Schematic; import de.steamwar.sql.Schematic;
import java.awt.*; import java.awt.*;
import java.util.List; import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Getter;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
@ -320,6 +323,8 @@ public class Region {
private final int extensionAxisX; private final int extensionAxisX;
private final boolean extensionPrototypeArea; private final boolean extensionPrototypeArea;
private final int waterLevel;
private final String schematic; private final String schematic;
private final boolean rotate; private final boolean rotate;
@ -344,6 +349,7 @@ public class Region {
extensionArea = true; extensionArea = true;
} }
extensionPrototypeArea = extensionNegativeZ != 0 || extensionPositiveZ != 0 || extensionPositiveY != 0 || extensionAxisX != 0; extensionPrototypeArea = extensionNegativeZ != 0 || extensionPositiveZ != 0 || extensionPositiveY != 0 || extensionAxisX != 0;
waterLevel = config.getInt("waterLevel", 0);
rotate = config.getBoolean("rotate", false); rotate = config.getBoolean("rotate", false);
ConfigurationSection testblockSection = config.getConfigurationSection("testblock"); ConfigurationSection testblockSection = config.getConfigurationSection("testblock");
@ -436,32 +442,16 @@ public class Region {
} }
} }
@Getter
@AllArgsConstructor
public static class Point { public static class Point {
final int x; final int x;
final int y; final int y;
final int z; final int z;
public Point(int x, int y, int z) {
this.x = x;
this.y = y;
this.z = z;
}
public BlockVector3 toBlockVector3() { public BlockVector3 toBlockVector3() {
return BlockVector3.at(this.x, this.y, this.z); return BlockVector3.at(this.x, this.y, this.z);
} }
public int getX() {
return this.x;
}
public int getY() {
return this.y;
}
public int getZ() {
return this.z;
}
} }
} }