From efc7a3fe48a5bae9c97d1c5465c8aa799939b0d8 Mon Sep 17 00:00:00 2001
From: Chaoscaot <chaoscaot@zohomail.eu>
Date: Mon, 1 May 2023 10:10:25 +0200
Subject: [PATCH] Fix Fight Merging

---
 src/de/steamwar/bungeecore/commands/FightCommand.java | 2 +-
 src/de/steamwar/messages/BungeeCore.properties        | 4 ++--
 src/de/steamwar/messages/BungeeCore_de.properties     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/de/steamwar/bungeecore/commands/FightCommand.java b/src/de/steamwar/bungeecore/commands/FightCommand.java
index e5cf3e4c..42499ee8 100644
--- a/src/de/steamwar/bungeecore/commands/FightCommand.java
+++ b/src/de/steamwar/bungeecore/commands/FightCommand.java
@@ -160,7 +160,7 @@ public class FightCommand extends SWCommand {
             for (Subserver subserver : Subserver.getServerList()) {
                 if(subserver instanceof Arenaserver) {
                     Arenaserver arenaserver = (Arenaserver) subserver;
-                    if(mode.getInternalName().equals(arenaserver.getMode()) && map.equals(arenaserver.getMap()) && arenaserver.isAllowMerge() && arenaserver.getServer().getPlayers().size() == 1) {
+                    if(mode.getInternalName().equals(arenaserver.getMode()) && arenaserver.isAllowMerge() && arenaserver.getServer().getPlayers().size() == 1) {
                         mergable = arenaserver;
                         break;
                     }
diff --git a/src/de/steamwar/messages/BungeeCore.properties b/src/de/steamwar/messages/BungeeCore.properties
index 219d49a4..d8bb2fd2 100644
--- a/src/de/steamwar/messages/BungeeCore.properties
+++ b/src/de/steamwar/messages/BungeeCore.properties
@@ -653,8 +653,8 @@ MODIFICATION_CHECK_SUCCESS=§eYour mods have been checked and you are now allowe
 
 #Arena Merging
 FIGHT_MERGE_TITLE=Equal fight found!
-FIGHT_MERGE_DECLINE=Launch new arena
-FIGHT_MERGE_ACCEPT=Join fight
+FIGHT_MERGE_DECLINE=§cLaunch new arena
+FIGHT_MERGE_ACCEPT=§aJoin fight
 FIGHT_MERGE_INFO_LORE_1=§8By: §e{0}
 FIGHT_MERGE_OFFLINE=§7The proposed arena has been terminated in the meantime, a new arena will be started.
 FIGHT_MERGE_INFO=§e{0}§8: §e{1}
diff --git a/src/de/steamwar/messages/BungeeCore_de.properties b/src/de/steamwar/messages/BungeeCore_de.properties
index 9e5659e1..18c043f3 100644
--- a/src/de/steamwar/messages/BungeeCore_de.properties
+++ b/src/de/steamwar/messages/BungeeCore_de.properties
@@ -630,8 +630,8 @@ MODIFICATION_CHECK_SUCCESS=§eDeine Mods wurden geprüft und du darfst nun auf A
 
 #Arena Merging
 FIGHT_MERGE_TITLE=Gleicher Kampf gefunden!
-FIGHT_MERGE_DECLINE=Neue Arena starten
-FIGHT_MERGE_ACCEPT=Kampf beitreten
+FIGHT_MERGE_DECLINE=§cNeue Arena starten
+FIGHT_MERGE_ACCEPT=§aKampf beitreten
 FIGHT_MERGE_INFO_LORE_1=§8Von: §e{0}
 FIGHT_MERGE_OFFLINE=§7Die vorgeschlagene Arena wurde in der Zwischenzeit beendet, es wird eine neue Arena gestartet.