From 7b55e99be0bdf2e504016d0d5fd9fa7119cb46a7 Mon Sep 17 00:00:00 2001
From: Lixfel <git-5w3l@lixfel.de>
Date: Tue, 3 Dec 2024 17:05:53 +0100
Subject: [PATCH] Fix arena start condition

---
 .../src/de/steamwar/velocitycore/ServerStarter.java  |  8 ++++++++
 .../steamwar/velocitycore/commands/FightCommand.java | 12 ------------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/VelocityCore/src/de/steamwar/velocitycore/ServerStarter.java b/VelocityCore/src/de/steamwar/velocitycore/ServerStarter.java
index f6ee7928..1b834390 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/ServerStarter.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/ServerStarter.java
@@ -85,6 +85,14 @@ public class ServerStarter {
         directory = new File(SERVER_PATH, mode.getFolder());
         arguments.put("config", mode.getConfig());
         tempWorld(SERVER_PATH + mode.getFolder() + "/arenas/" + map);
+        startCondition = () -> {
+            if(playersToSend.stream().anyMatch(player -> Subserver.isArena(Subserver.getSubserver(player)))) {
+                playersToSend.forEach(player -> Chatter.of(player).system("FIGHT_IN_ARENA"));
+                return false;
+            }
+
+            return true;
+        };
         return this;
     }
 
diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/FightCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/FightCommand.java
index 29147c99..6c320758 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/FightCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/FightCommand.java
@@ -60,19 +60,7 @@ public class FightCommand extends SWCommand {
         sender.sendMessage(start);
     }
 
-    private static boolean alreadyInArena(PlayerChatter sender){
-        if(Subserver.isArena(Subserver.getSubserver(sender.getPlayer()))){
-            sender.system("FIGHT_IN_ARENA");
-            return true;
-        }
-
-        return false;
-    }
-
     static void createArena(PlayerChatter sender, String precommand, boolean allowMerging, ArenaMode arenaMode, String map, boolean historic, FightCallback callback) {
-        if(alreadyInArena(sender))
-            return;
-
         if (arenaMode == null) {
             getModes(sender, precommand, historic);
             return;