diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStone.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStone.java index fe529864..a4836c33 100644 --- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStone.java +++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStone.java @@ -31,10 +31,7 @@ import org.bukkit.Material; import org.bukkit.World; import org.bukkit.entity.Player; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; public class DesignEndStone { @@ -56,12 +53,12 @@ public class DesignEndStone { this.maxY = region.getBuildArea().getMaxPoint(false).getY(); this.maxZ = region.getBuildArea().getMaxPoint(false).getZ(); - limited = region.getGameModeConfig().Schematic.Limited - .entrySet() - .stream() - .filter(entry -> entry.getValue() == 0) - .flatMap(entry -> entry.getKey().stream()) + limited = Arrays.stream(Material.values()) + .filter(Material::isBlock) + .filter(material -> !material.isLegacy()) + .filter(material -> material.getBlastResistance() > region.getGameModeConfig().Schematic.MaxDesignBlastResistance) .collect(Collectors.toSet()); + System.out.println(limited); calculateFromBottom = region.getGameModeConfig().Arena.NoFloor; entityServer.setCallback((player, rEntity, entityAction) -> { diff --git a/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java b/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java index dc4e7300..e0b942ef 100644 --- a/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java +++ b/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java @@ -649,7 +649,7 @@ public final class GameModeConfig { /** * Maximal blast resistance for the design blocks * - * @implSpec {@code Double.MAX_VALUE} by default + * @implSpec {@link SchematicConfig#MaxBlastResistance} by default */ public final double MaxDesignBlastResistance; @@ -679,7 +679,7 @@ public final class GameModeConfig { MaxBlocks = loader.getInt("MaxBlocks", 0); MaxDispenserItems = loader.getInt("MaxDispenserItems", 128); MaxBlastResistance = loader.getDouble("MaxBlastResistance", Double.MAX_VALUE); - MaxDesignBlastResistance = loader.getDouble("MaxDesignBlastResistance", Double.MAX_VALUE); + MaxDesignBlastResistance = loader.getDouble("MaxDesignBlastResistance", MaxBlastResistance); Map, Integer> Limited = new HashMap<>(); for (Map entry : loader.getMapList("Limited")) {