From 2263cdd4b451c1bbec376fa58957c6ab406baac7 Mon Sep 17 00:00:00 2001 From: yoyosource Date: Tue, 7 Jun 2022 15:02:44 +0200 Subject: [PATCH] Update Config --- FightSystem_Core/src/de/steamwar/fightsystem/Config.java | 2 +- .../src/de/steamwar/fightsystem/listener/PistonListener.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/Config.java b/FightSystem_Core/src/de/steamwar/fightsystem/Config.java index 9404bbe..b985885 100644 --- a/FightSystem_Core/src/de/steamwar/fightsystem/Config.java +++ b/FightSystem_Core/src/de/steamwar/fightsystem/Config.java @@ -173,7 +173,6 @@ public class Config { GroundWalkable = config.getBoolean("Arena.GroundWalkable", true); DisableSnowMelt = config.getBoolean("Arena.DisableSnowMelt", false); ArenaLeaveable = config.getBoolean("Arena.Leaveable", false); - AllowMissiles = config.getBoolean("Arena.AllowMissiles", false); int schemsizeX = config.getInt("Schematic.Size.x"); int schemsizeY = config.getInt("Schematic.Size.y"); @@ -196,6 +195,7 @@ public class Config { PercentBlocks = Collections.unmodifiableSet(config.getStringList("WinConditionParams.Blocks").stream().map(Material::valueOf).collect(Collectors.toSet())); EnterStages = Collections.unmodifiableList(config.getIntegerList("EnterStages")); + AllowMissiles = config.getBoolean("Arena.AllowMissiles", EnterStages.isEmpty()); KitFile = config.getString("Kits.File", "kits.yml"); MemberDefault = config.getString("Kits.MemberDefault", "default"); diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/listener/PistonListener.java b/FightSystem_Core/src/de/steamwar/fightsystem/listener/PistonListener.java index 9c60d19..7aba189 100644 --- a/FightSystem_Core/src/de/steamwar/fightsystem/listener/PistonListener.java +++ b/FightSystem_Core/src/de/steamwar/fightsystem/listener/PistonListener.java @@ -36,8 +36,8 @@ public class PistonListener implements Listener { public PistonListener() { //Wenn Entern aktiv ist, sollen Raketen etc. entern können if(!ArenaMode.Check.contains(Config.mode)) { - new StateDependentListener(Config.EnterStages.isEmpty() || Config.AllowMissiles, FightState.All, this); - new StateDependentListener(!(Config.EnterStages.isEmpty() || Config.AllowMissiles), FightState.Setup, this); + new StateDependentListener(!Config.AllowMissiles, FightState.All, this); + new StateDependentListener(Config.AllowMissiles, FightState.Setup, this); } }