SteamWar/BungeeCore
SteamWar/BungeeCore
Archiviert
13
2
Fork 1
Code Issues 14 Pull-Requests 4 Releases Wiki Aktivität

Merge pull request 'Fix Fight Merging' (#472) from fix_fight_merging into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details

Quellcode durchsuchen 
Reviewed-on: #472
Reviewed-by: Lixfel <lixfel@steamwar.de>
Dieser Commit ist enthalten in:
Lixfel 2023-05-01 10:29:35 +02:00
Commit 4052e342fb
3 geänderte Dateien mit 5 neuen und 5 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

2
src/de/steamwar/bungeecore/commands/FightCommand.java
Datei anzeigen

@ -160,7 +160,7 @@ public class FightCommand extends SWCommand {
for (Subserver subserver : Subserver.getServerList()) { for (Subserver subserver : Subserver.getServerList()) {
if(subserver instanceof Arenaserver) { if(subserver instanceof Arenaserver) {
Arenaserver arenaserver = (Arenaserver) subserver; 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; mergable = arenaserver;
break; break;
} }

4
src/de/steamwar/messages/BungeeCore.properties
Datei anzeigen

@ -653,8 +653,8 @@ MODIFICATION_CHECK_SUCCESS=§eYour mods have been checked and you are now allowe
#Arena Merging #Arena Merging
FIGHT_MERGE_TITLE=Equal fight found! FIGHT_MERGE_TITLE=Equal fight found!
FIGHT_MERGE_DECLINE=Launch new arena FIGHT_MERGE_DECLINE=§cLaunch new arena
FIGHT_MERGE_ACCEPT=Join fight FIGHT_MERGE_ACCEPT=§aJoin fight
FIGHT_MERGE_INFO_LORE_1=§8By: §e{0} 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_OFFLINE=§7The proposed arena has been terminated in the meantime, a new arena will be started.
FIGHT_MERGE_INFO=§e{0}§8: §e{1} FIGHT_MERGE_INFO=§e{0}§8: §e{1}

4
src/de/steamwar/messages/BungeeCore_de.properties
Datei anzeigen

@ -630,8 +630,8 @@ MODIFICATION_CHECK_SUCCESS=§eDeine Mods wurden geprüft und du darfst nun auf A
#Arena Merging #Arena Merging
FIGHT_MERGE_TITLE=Gleicher Kampf gefunden! FIGHT_MERGE_TITLE=Gleicher Kampf gefunden!
FIGHT_MERGE_DECLINE=Neue Arena starten FIGHT_MERGE_DECLINE=§cNeue Arena starten
FIGHT_MERGE_ACCEPT=Kampf beitreten FIGHT_MERGE_ACCEPT=§aKampf beitreten
FIGHT_MERGE_INFO_LORE_1=§8Von: §e{0} 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. FIGHT_MERGE_OFFLINE=§7Die vorgeschlagene Arena wurde in der Zwischenzeit beendet, es wird eine neue Arena gestartet.