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

Fix DesignEndStone

Browse Source 
Closes: #292
Closes: #288
This commit is contained in:
YoyoNow
2026-03-13 21:08:00 +01:00
parent a750185df0
commit ab85c72fe3
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStone.java
+6 -9
View File
@@ -31,10 +31,7 @@ import org.bukkit.Material;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import java.util.ArrayList; import java.util.*;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
public class DesignEndStone { public class DesignEndStone {
@@ -56,12 +53,12 @@ public class DesignEndStone {
this.maxY = region.getBuildArea().getMaxPoint(false).getY(); this.maxY = region.getBuildArea().getMaxPoint(false).getY();
this.maxZ = region.getBuildArea().getMaxPoint(false).getZ(); this.maxZ = region.getBuildArea().getMaxPoint(false).getZ();
limited = region.getGameModeConfig().Schematic.Limited limited = Arrays.stream(Material.values())
.entrySet() .filter(Material::isBlock)
.stream() .filter(material -> !material.isLegacy())
.filter(entry -> entry.getValue() == 0) .filter(material -> material.getBlastResistance() > region.getGameModeConfig().Schematic.MaxDesignBlastResistance)
.flatMap(entry -> entry.getKey().stream())
.collect(Collectors.toSet()); .collect(Collectors.toSet());
System.out.println(limited);
calculateFromBottom = region.getGameModeConfig().Arena.NoFloor; calculateFromBottom = region.getGameModeConfig().Arena.NoFloor;
entityServer.setCallback((player, rEntity, entityAction) -> { entityServer.setCallback((player, rEntity, entityAction) -> {
CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java
+2 -2
View File
@@ -649,7 +649,7 @@ public final class GameModeConfig<M, W> {
/** /**
* Maximal blast resistance for the design blocks * Maximal blast resistance for the design blocks
* *
* @implSpec {@code Double.MAX_VALUE} by default * @implSpec {@link SchematicConfig#MaxBlastResistance} by default
*/ */
public final double MaxDesignBlastResistance; public final double MaxDesignBlastResistance;
@@ -679,7 +679,7 @@ public final class GameModeConfig<M, W> {
MaxBlocks = loader.getInt("MaxBlocks", 0); MaxBlocks = loader.getInt("MaxBlocks", 0);
MaxDispenserItems = loader.getInt("MaxDispenserItems", 128); MaxDispenserItems = loader.getInt("MaxDispenserItems", 128);
MaxBlastResistance = loader.getDouble("MaxBlastResistance", Double.MAX_VALUE); MaxBlastResistance = loader.getDouble("MaxBlastResistance", Double.MAX_VALUE);
MaxDesignBlastResistance = loader.getDouble("MaxDesignBlastResistance", Double.MAX_VALUE); MaxDesignBlastResistance = loader.getDouble("MaxDesignBlastResistance", MaxBlastResistance);
Map<Set<M>, Integer> Limited = new HashMap<>(); Map<Set<M>, Integer> Limited = new HashMap<>();
for (Map<?, ?> entry : loader.getMapList("Limited")) { for (Map<?, ?> entry : loader.getMapList("Limited")) {