Merge pull request 'Fix Fight Merging' (#472) from fix_fight_merging into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #472 Reviewed-by: Lixfel <lixfel@steamwar.de>
Dieser Commit ist enthalten in:
Commit
4052e342fb
@ -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;
|
||||
}
|
||||
|
@ -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}
|
||||
|
@ -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.
|
||||
|
||||
|
In neuem Issue referenzieren
Einen Benutzer sperren