Merge branch 'master' into schemsearch

CommonCore

@@ -1 +1 @@
-Subproject commit e8d964d8333f353d9995e8319694077e0f8e063b
+Subproject commit 5aca43b35e9b9fca5252ee107e3e0d08c3c9d7fa

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;
                     }

src/de/steamwar/bungeecore/commands/MsgCommand.java

@@ -36,7 +36,7 @@ public class MsgCommand extends SWCommand {
     }
 
     @Register(description = "MSG_USAGE")
-    public void genericCommand(ProxiedPlayer sender, ProxiedPlayer target, @ErrorMessage(value = "MSG_USAGE", allowEAs = false) String... message) {
+    public void genericCommand(ProxiedPlayer sender, @ErrorMessage(value = "MSG_OFFLINE") ProxiedPlayer target, @ErrorMessage(value = "MSG_USAGE", allowEAs = false) String... message) {
         msg(sender, target, message);
     }
 

src/de/steamwar/bungeecore/commands/RegelnCommand.java

@@ -36,5 +36,6 @@ public class RegelnCommand extends SWCommand {
         Message.sendPrefixless("REGELN_MWG", player, Message.parse("REGELN_MWG_HOVER", player), new ClickEvent(ClickEvent.Action.OPEN_URL, Message.parse("REGELN_MWG_URL", player)));
         Message.sendPrefixless("REGELN_WG", player, Message.parse("REGELN_WG_HOVER", player), new ClickEvent(ClickEvent.Action.OPEN_URL, Message.parse("REGELN_WG_URL", player)));
         Message.sendPrefixless("REGELN_WS", player, Message.parse("REGELN_WS_HOVER", player), new ClickEvent(ClickEvent.Action.OPEN_URL, Message.parse("REGELN_WS_URL", player)));
+        Message.sendPrefixless("REGELN_CONDUCT", player, Message.parse("REGELN_CONDUCT_HOVER", player), new ClickEvent(ClickEvent.Action.OPEN_URL, Message.parse("REGELN_CONDUCT_URL", player)));
     }
 }

src/de/steamwar/messages/BungeeCore.properties

@@ -355,6 +355,9 @@ REGELN_WG_URL=https://steamwar.de/spielmodi/wargear-regelwerk/
 REGELN_WS=§eWarShip §7Rules
 REGELN_WS_HOVER=§7https://steamwar.de/spielmodi/warship-regelwerk/
 REGELN_WS_URL=https://steamwar.de/spielmodi/warship-regelwerk/
+REGELN_CONDUCT=§eCode of conduct
+REGELN_CONDUCT_HOVER=§7https://steamwar.de/verhaltensrichtlinien/
+REGELN_CONDUCT_URL=https://steamwar.de/verhaltensrichtlinien/
 
 #ReplayCommand
 REPLAY_TITLE=Most recent fights
@@ -651,8 +654,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}

src/de/steamwar/messages/BungeeCore_de.properties

@@ -338,6 +338,9 @@ REGELN_WG_URL=https://steamwar.de/spielmodi/wargear-regelwerk/
 REGELN_WS=§eWarShip§8-§7Regelwerk
 REGELN_WS_HOVER=§7https://steamwar.de/spielmodi/warship-regelwerk/
 REGELN_WS_URL=https://steamwar.de/spielmodi/warship-regelwerk/
+REGELN_CONDUCT=§eVerhaltensrichtlinien
+REGELN_CONDUCT_HOVER=§7https://steamwar.de/verhaltensrichtlinien/
+REGELN_CONDUCT_URL=https://steamwar.de/verhaltensrichtlinien/
 
 #ReplayCommand
 REPLAY_TITLE=Letzte Kämpfe
@@ -627,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.