Jaki/SteamWar
1
0
Fork 0
forked from SteamWar/SteamWar
Code Pull Requests Activity

Improve some stuff

Browse Source
This commit is contained in:
YoyoNow
2025-08-04 21:58:36 +02:00
parent 514a7073ab
commit ef4efcec42
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/DynamicRegion.java
+1
View File
@@ -55,6 +55,7 @@ public abstract class DynamicRegion implements Region {
this.minX = regionConstructorData.minX; this.minX = regionConstructorData.minX;
this.minZ = regionConstructorData.minZ; this.minZ = regionConstructorData.minZ;
backups = RegionDataRepository.getBackups(this); backups = RegionDataRepository.getBackups(this);
RegionDataRepository.saveRegion(this);
DynamicRegionSystem.INSTANCE.add(this); DynamicRegionSystem.INSTANCE.add(this);
} }
BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/RegionConstructorData.java
+2 -3
View File
@@ -39,9 +39,9 @@ public class RegionConstructorData {
public final int minX; public final int minX;
public final int minZ; public final int minZ;
public RegionConstructorData(JsonObject jsonObject) { public RegionConstructorData(JsonObject jsonObject, UUID uuid) {
regionClass = jsonObject.get("regionClass").getAsString(); regionClass = jsonObject.get("regionClass").getAsString();
uuid = UUID.fromString(jsonObject.get("uuid").getAsString()); this.uuid = uuid;
minX = jsonObject.get("minX").getAsInt(); minX = jsonObject.get("minX").getAsInt();
minZ = jsonObject.get("minZ").getAsInt(); minZ = jsonObject.get("minZ").getAsInt();
} }
@@ -53,7 +53,6 @@ public class RegionConstructorData {
writer.setIndent(" "); writer.setIndent(" ");
writer.beginObject(); writer.beginObject();
writer.name("regionClass").value(regionClass); writer.name("regionClass").value(regionClass);
writer.name("uuid").value(uuid.toString());
writer.name("minX").value(minX); writer.name("minX").value(minX);
writer.name("minZ").value(minZ); writer.name("minZ").value(minZ);
writer.endObject(); writer.endObject();
BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/RegionDataRepository.java
+1 -1
View File
@@ -96,7 +96,7 @@ public class RegionDataRepository {
File metaFile = new File(file, META_FILE_NAME); File metaFile = new File(file, META_FILE_NAME);
if (!metaFile.exists()) continue; if (!metaFile.exists()) continue;
JsonObject jsonObject = JsonParser.parseReader(new FileReader(metaFile)).getAsJsonObject(); JsonObject jsonObject = JsonParser.parseReader(new FileReader(metaFile)).getAsJsonObject();
RegionConstructorData regionConstructorData = new RegionConstructorData(jsonObject); RegionConstructorData regionConstructorData = new RegionConstructorData(jsonObject, UUID.fromString(file.getName()));
Function<RegionConstructorData, DynamicRegion> constructor = regionCreators.get(regionConstructorData.regionClass); Function<RegionConstructorData, DynamicRegion> constructor = regionCreators.get(regionConstructorData.regionClass);
if (constructor == null) continue; if (constructor == null) continue;
regions.add(constructor.apply(regionConstructorData)); regions.add(constructor.apply(regionConstructorData));
BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/spawn/SpawnResetter.java
+4
View File
@@ -58,6 +58,8 @@ public class SpawnResetter {
.collect(Collectors.toList()); .collect(Collectors.toList());
if (neighbours.size() == 8) { if (neighbours.size() == 8) {
Bukkit.getWorlds().get(0).setSpawnLocation(BIG_WORLD_SPAWN);
Region.Area area = spawnRegion.getArea(); Region.Area area = spawnRegion.getArea();
Point minPoint = area.getMinPoint(false).subtract(19, 0, 19); Point minPoint = area.getMinPoint(false).subtract(19, 0, 19);
Clipboard clipboard = FlatteningWrapper.impl.loadSchematic(RESET_FILE); Clipboard clipboard = FlatteningWrapper.impl.loadSchematic(RESET_FILE);
@@ -74,6 +76,8 @@ public class SpawnResetter {
} }
}); });
return; return;
} else {
Bukkit.getWorlds().get(0).setSpawnLocation(SMALL_WORLD_SPAWN);
} }
internalReset(spawnRegion, spawnRegion != region); internalReset(spawnRegion, spawnRegion != region);