# Conflicts:
#	src/de/steamwar/bungeecore/commands/FightCommand.java

@@ -51,6 +51,7 @@ public class ServerStarter {
         serverJar = mode.serverJar();
         directory = new File(SERVER_PATH, mode.getFolder());
         arguments.put("config", mode.getConfig());
+        constructor = (serverName, port, builder, shutdownCallback) -> new Arenaserver(serverName, mode.getDisplayName(), map, !mode.isRanked(), port, builder, shutdownCallback);

@@ -61,6 +62,7 @@ public class ServerStarter {
         worldDir = EVENT_PATH;
         worldCleanup = () -> {};
         arguments.put("fightID", String.valueOf(eventFight.getFightID()));
+        constructor = (serverName, port, builder, shutdownCallback) -> new Arenaserver(serverName, eventFight.getSpielmodus().getDisplayName(), eventFight.getMap(), false, port, builder, shutdownCallback);

@@ -159,3 +161,3 @@
             return;
 
-        callback.run(player, mode, map);
+        if(precommand.equals("/bau testarena ") || precommand.startsWith("/challenge ")) {

@@ -162,0 +169,4 @@
+
+    public static boolean suggestMerging(ProxiedPlayer player, ArenaMode mode, String map, FightCallback declineMerge) {
+        Arenaserver mergable = null;
+        for (Subserver subserver : Subserver.getServerList()) {

@@ -162,0 +186,4 @@
+                declineMerge.run(player, mode, map);
+            });
+            Arenaserver finalMergable = mergable;
+            SWItem item = new SWItem("§e" + ArenaMode.getByInternal(finalMergable.getMode()).getDisplayName() + "§7: §e" + finalMergable.getMap().toUpperCase(), 11);

@@ -162,0 +190,4 @@
+            item.addLore(Message.parse("FIGHT_MERGE_INFO_LORE_1", player, finalMergable.getServer().getPlayers().stream().map(ProxiedPlayer::getDisplayName).reduce((player1, player2) -> player1 + ", " + player2).orElse("Error?")));
+            inventory.addItem(4, item, click -> {});
+            inventory.addItem(8, new SWItem(Message.parse("FIGHT_MERGE_ACCEPT", player), 10), click -> {
+                if(BungeeCore.get().getProxy().getServerInfo(finalMergable.getServer().getName()) != null) {

@@ -51,6 +51,7 @@ public class ServerStarter {
         serverJar = mode.serverJar();
         directory = new File(SERVER_PATH, mode.getFolder());
         arguments.put("config", mode.getConfig());
+        constructor = (serverName, port, builder, shutdownCallback) -> new Arenaserver(serverName, mode.getInternalName(), map, true, port, builder, shutdownCallback);

@@ -72,3 +72,3 @@
         }
 
-        FightCommand.createArena(sender, "/challenge " + target.getName() + " ", args, 1, false, (player, mode, map) -> {
+        FightCommand.createArena(sender, "/challenge " + target.getName() + " ", true, args, 1, false, (player, mode, map) -> {

@@ -161,1 +163,3 @@
-        callback.run(player, mode, map);
+        if(!allowMerging) {
+            callback.run(player, mode, map);
+        } else if(suggestMerging(player, mode, map, callback)) {

@@ -162,0 +181,4 @@
+            }
+        }
+
+        if(mergable != null) {

@@ -162,0 +189,4 @@
+            });
+            Arenaserver finalMergable = mergable;
+            SWItem item = new SWItem(Message.parse("FIGHT_MERGE_INFO", player, mode.getDisplayName(), finalMergable.getMap()), 11);
+            item.addLore(Message.parse("FIGHT_MERGE_INFO_LORE_1", player, finalMergable.getServer().getPlayers().stream().map(ProxiedPlayer::getDisplayName).reduce((player1, player2) -> player1 + ", " + player2).orElse("Error?")));

@@ -591,1 +591,4 @@
 MODIFICATION_CHECK_SUCCESS=§eDeine Mods wurden geprüft und du darfst nun auf Arenen joinen!
+
+#Arena Merging
+FIGHT_MERGE_TITLE=Gleicher Fight gefunden!

@@ -592,0 +593,4 @@
+#Arena Merging
+FIGHT_MERGE_TITLE=Gleicher Fight gefunden!
+FIGHT_MERGE_DECLINE=Neue Arena starten
+FIGHT_MERGE_ACCEPT=Fight beitreten

@@ -592,0 +594,4 @@
+FIGHT_MERGE_TITLE=Gleicher Fight gefunden!
+FIGHT_MERGE_DECLINE=Neue Arena starten
+FIGHT_MERGE_ACCEPT=Fight beitreten
+FIGHT_MERGE_INFO_LORE_1=§7Von: §e{0}

@@ -592,0 +595,4 @@
+FIGHT_MERGE_DECLINE=Neue Arena starten
+FIGHT_MERGE_ACCEPT=Fight beitreten
+FIGHT_MERGE_INFO_LORE_1=§7Von: §e{0}
+FIGHT_MERGE_OFFLINE=Der Server dem du beitreten wolltest ist nicht mehr online

@@ -592,0 +596,4 @@
+FIGHT_MERGE_ACCEPT=Fight beitreten
+FIGHT_MERGE_INFO_LORE_1=§7Von: §e{0}
+FIGHT_MERGE_OFFLINE=Der Server dem du beitreten wolltest ist nicht mehr online
+FIGHT_MERGE_INFO=§e{0}§7: §e{1}

@@ -44,0 +43,4 @@
+    private boolean allowMerge = false;
+    private String fightMap = null;
+    private String gameMode = null;
+    private ServerConstructor constructor = (serverName, port, allowMerge, builder, shutdownCallback) -> new Arenaserver(serverName, gameMode, fightMap, false, port, builder, shutdownCallback);

@@ -170,0 +188,4 @@
+        }
+
+        if(mergable == null) {
+            return true;