From deb56c0c028cd403f544644780f3b0944a4a5036 Mon Sep 17 00:00:00 2001
From: Jakob Schulz <55949993+Lordikak@users.noreply.github.com>
Date: Tue, 19 May 2026 19:24:03 +0200
Subject: [PATCH] rename property

---
 CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java | 10 +++++-----
 FightSystem/FightSystem_Core/src/config.yml            |  5 ++++-
 .../fightsystem/listener/BlockFormListener.java        |  4 ++--
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java b/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java
index 8a8a9a1f..f8b27f59 100644
--- a/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java
+++ b/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java
@@ -465,7 +465,7 @@ public final class GameModeConfig<M, W> {
          *
          * @implSpec {@code empty} by default
          */
-        public final Set<M> BlockedFormedBlocks;
+        public final Set<M> DisabledBlockForms;
 
         /**
          * Allow leaving the arena area as spectator
@@ -488,7 +488,7 @@ public final class GameModeConfig<M, W> {
          */
         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();
             WaterDepth = loader.getInt("WaterDepth", 0);
             WaterDamage = loader.getBoolean("WaterDamage", true);
@@ -497,11 +497,11 @@ public final class GameModeConfig<M, W> {
             BorderFromSchematic = loader.getInt("BorderFromSchematic", 21);
             GroundWalkable = loader.getBoolean("GroundWalkable", true);
             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)) {
-                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);
             AllowMissiles = loader.getBoolean("AllowMissiles", !EnterStages.isEmpty());
             NoFloor = loader.getBoolean("NoFloor", false);
diff --git a/FightSystem/FightSystem_Core/src/config.yml b/FightSystem/FightSystem_Core/src/config.yml
index 81a8ff77..81620820 100644
--- a/FightSystem/FightSystem_Core/src/config.yml
+++ b/FightSystem/FightSystem_Core/src/config.yml
@@ -49,12 +49,15 @@ Arena:
   # Disable snow and ice melting
   DisableSnowMelt: false # defaults to false if missing
   # Disabled blocks from forming
-  BlockedFormedBlocks:
+  DisabledBlockForms:
     # For Cobble Generators
     # - COBBLESTONE
     # - BASALT
     # - STONE
     # - OBSIDIAN
+  # Disable ice specifically from forming
+  # Deprecated, add ICE to DisabledBlockForms list instead
+  DisableIceForm: false
   # Allow leaving the arena area as spectator
   Leaveable: false # defaults to false if missing
   # Allow missiles to fly to the enemy and not stop at the schem border.
diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockFormListener.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockFormListener.java
index c50133c7..55d58adb 100644
--- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockFormListener.java
+++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockFormListener.java
@@ -32,7 +32,7 @@ import org.bukkit.event.block.BlockFormEvent;
 public class BlockFormListener implements Listener {
 
     public BlockFormListener() {
-        boolean enabled = !Config.GameModeConfig.Arena.BlockedFormedBlocks.isEmpty();
+        boolean enabled = !Config.GameModeConfig.Arena.DisabledBlockForms.isEmpty();
         new StateDependentListener(enabled, FightState.All, this);
     }
 
@@ -41,7 +41,7 @@ public class BlockFormListener implements Listener {
         if (!Config.ArenaRegion.inRegion(event.getBlock())) return;
 
         Material material = event.getNewState().getType();
-        if (Config.GameModeConfig.Arena.BlockedFormedBlocks.contains(material)) {
+        if (Config.GameModeConfig.Arena.DisabledBlockForms.contains(material)) {
             event.setCancelled(true);
         }
     }