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

rename property

Browse Source
This commit is contained in:
Jakob Schulz
2026-05-19 19:24:03 +02:00
parent e9c766dbbb
commit deb56c0c02
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java
+5 -5
View File
@@ -465,7 +465,7 @@ public final class GameModeConfig<M, W> {
* *
* @implSpec {@code empty} by default * @implSpec {@code empty} by default
*/ */
public final Set<M> BlockedFormedBlocks; public final Set<M> DisabledBlockForms;
/** /**
* Allow leaving the arena area as spectator * Allow leaving the arena area as spectator
@@ -488,7 +488,7 @@ public final class GameModeConfig<M, W> {
*/ */
public final boolean NoFloor; public final boolean NoFloor;
private ArenaConfig(YMLWrapper<M,W> loader, SchematicConfig.SizeConfig Size, List<Integer> EnterStages) { private ArenaConfig(YMLWrapper<M, W> loader, SchematicConfig.SizeConfig Size, List<Integer> EnterStages) {
loaded = loader.canLoad(); loaded = loader.canLoad();
WaterDepth = loader.getInt("WaterDepth", 0); WaterDepth = loader.getInt("WaterDepth", 0);
WaterDamage = loader.getBoolean("WaterDamage", true); WaterDamage = loader.getBoolean("WaterDamage", true);
@@ -497,11 +497,11 @@ public final class GameModeConfig<M, W> {
BorderFromSchematic = loader.getInt("BorderFromSchematic", 21); BorderFromSchematic = loader.getInt("BorderFromSchematic", 21);
GroundWalkable = loader.getBoolean("GroundWalkable", true); GroundWalkable = loader.getBoolean("GroundWalkable", true);
DisableSnowMelt = loader.getBoolean("DisableSnowMelt", false); DisableSnowMelt = loader.getBoolean("DisableSnowMelt", false);
Set<M> blockedFormedBlocks = new HashSet<>(loader.getMaterialList("BlockedFormedBlocks")); Set<M> disabledBlockForms = new HashSet<>(loader.getMaterialList("DisabledBlockForms"));
if (loader.getBoolean("DisableIceForm", false)) { if (loader.getBoolean("DisableIceForm", false)) {
blockedFormedBlocks.add(loader.materialMapper.apply("ICE")); disabledBlockForms.add(loader.materialMapper.apply("ICE"));
} }
BlockedFormedBlocks = Collections.unmodifiableSet(blockedFormedBlocks); DisabledBlockForms = Collections.unmodifiableSet(disabledBlockForms);
Leaveable = loader.getBoolean("Leaveable", false); Leaveable = loader.getBoolean("Leaveable", false);
AllowMissiles = loader.getBoolean("AllowMissiles", !EnterStages.isEmpty()); AllowMissiles = loader.getBoolean("AllowMissiles", !EnterStages.isEmpty());
NoFloor = loader.getBoolean("NoFloor", false); NoFloor = loader.getBoolean("NoFloor", false);
FightSystem/FightSystem_Core/src/config.yml
+4 -1
View File
@@ -49,12 +49,15 @@ Arena:
# Disable snow and ice melting # Disable snow and ice melting
DisableSnowMelt: false # defaults to false if missing DisableSnowMelt: false # defaults to false if missing
# Disabled blocks from forming # Disabled blocks from forming
BlockedFormedBlocks: DisabledBlockForms:
# For Cobble Generators # For Cobble Generators
# - COBBLESTONE # - COBBLESTONE
# - BASALT # - BASALT
# - STONE # - STONE
# - OBSIDIAN # - OBSIDIAN
# Disable ice specifically from forming
# Deprecated, add ICE to DisabledBlockForms list instead
DisableIceForm: false
# Allow leaving the arena area as spectator # Allow leaving the arena area as spectator
Leaveable: false # defaults to false if missing Leaveable: false # defaults to false if missing
# Allow missiles to fly to the enemy and not stop at the schem border. # Allow missiles to fly to the enemy and not stop at the schem border.
FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockFormListener.java
+2 -2
View File
@@ -32,7 +32,7 @@ import org.bukkit.event.block.BlockFormEvent;
public class BlockFormListener implements Listener { public class BlockFormListener implements Listener {
public BlockFormListener() { public BlockFormListener() {
boolean enabled = !Config.GameModeConfig.Arena.BlockedFormedBlocks.isEmpty(); boolean enabled = !Config.GameModeConfig.Arena.DisabledBlockForms.isEmpty();
new StateDependentListener(enabled, FightState.All, this); new StateDependentListener(enabled, FightState.All, this);
} }
@@ -41,7 +41,7 @@ public class BlockFormListener implements Listener {
if (!Config.ArenaRegion.inRegion(event.getBlock())) return; if (!Config.ArenaRegion.inRegion(event.getBlock())) return;
Material material = event.getNewState().getType(); Material material = event.getNewState().getType();
if (Config.GameModeConfig.Arena.BlockedFormedBlocks.contains(material)) { if (Config.GameModeConfig.Arena.DisabledBlockForms.contains(material)) {
event.setCancelled(true); event.setCancelled(true);
} }
} }