From 143cc279d30c31278933e090e0a8ce1923eaf24e Mon Sep 17 00:00:00 2001
From: Chaoscaot <chaoscaot444@gmail.com>
Date: Thu, 31 Mar 2022 23:02:26 +0200
Subject: [PATCH] :bug: Use it now

---
 src/de/steamwar/bungeecore/commands/FightCommand.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/de/steamwar/bungeecore/commands/FightCommand.java b/src/de/steamwar/bungeecore/commands/FightCommand.java
index aeeb8dcc..b71736fd 100644
--- a/src/de/steamwar/bungeecore/commands/FightCommand.java
+++ b/src/de/steamwar/bungeecore/commands/FightCommand.java
@@ -160,7 +160,11 @@ public class FightCommand extends BasicCommand {
         if(map == null)
             return;
 
-        callback.run(player, mode, map);
+        if(precommand.equals("/bau testarena ") || precommand.startsWith("/challenge ")) {
+            callback.run(player, mode, map);
+        } else if(suggestMerging(player, mode, map, callback)) {
+            callback.run(player, mode, map);
+        }
     }
 
     public static boolean suggestMerging(ProxiedPlayer player, ArenaMode mode, String map, FightCallback declineMerge) {