Merge branch 'master' into 1.18

FightSystem_Core/src/de/steamwar/fightsystem/ArenaMode.java

@@ -48,7 +48,7 @@ public enum ArenaMode {
     public static final Set<ArenaMode> AntiPrepare = Collections.unmodifiableSet(EnumSet.complementOf(EnumSet.of(PREPARE)));
     public static final Set<ArenaMode> VariableTeams = Collections.unmodifiableSet(EnumSet.complementOf(EnumSet.of(RANKED, EVENT, REPLAY)));
     public static final Set<ArenaMode> RankedEvent = Collections.unmodifiableSet(EnumSet.of(RANKED, EVENT, REPLAY));
-    public static final Set<ArenaMode> Restartable = Collections.unmodifiableSet(EnumSet.of(NORMAL, RANKED, REPLAY));
+    public static final Set<ArenaMode> Restartable = Collections.unmodifiableSet(EnumSet.of(NORMAL, RANKED));
     public static final Set<ArenaMode> NotRestartable = Collections.unmodifiableSet(EnumSet.of(EVENT, REPLAY));
     public static final Set<ArenaMode> SoloLeader = Collections.unmodifiableSet(EnumSet.of(TEST, CHECK, PREPARE));
     public static final Set<ArenaMode> NotOnBau = Collections.unmodifiableSet(EnumSet.complementOf(EnumSet.of(TEST, CHECK, PREPARE, REPLAY)));

FightSystem_Core/src/de/steamwar/fightsystem/fight/FightWorld.java

@@ -42,7 +42,7 @@ public class FightWorld extends StateDependent {
     }
 
     public FightWorld() {
-        super(ArenaMode.Restartable, FightState.Schem);
+        super(ArenaMode.Restartable.contains(Config.mode) || Config.replayserver(), FightState.Schem);
         register();
     }