Chaoscaot/VelocityCore
Archiviert
1
0
Fork 0
geforkt von SteamWar/BungeeCore
Code Pull-Requests Aktivität

Merge remote-tracking branch 'origin/master'

Quellcode durchsuchen
Dieser Commit ist enthalten in:
yoyosource 2023-05-01 11:22:06 +02:00
Commit 95a9e8d2a6
5 geänderte Dateien mit 13 neuen und 6 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;
} }

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

@ -36,7 +36,7 @@ public class MsgCommand extends SWCommand {
} }
@Register(description = "MSG_USAGE") @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); msg(sender, target, message);
} }

1
src/de/steamwar/bungeecore/commands/RegelnCommand.java
Datei anzeigen

@ -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_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_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_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)));
} }
} }

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

@ -354,6 +354,9 @@ REGELN_WG_URL=https://steamwar.de/spielmodi/wargear-regelwerk/
REGELN_WS=§eWarShip §7Rules REGELN_WS=§eWarShip §7Rules
REGELN_WS_HOVER=§7https://steamwar.de/spielmodi/warship-regelwerk/ REGELN_WS_HOVER=§7https://steamwar.de/spielmodi/warship-regelwerk/
REGELN_WS_URL=https://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 #ReplayCommand
REPLAY_TITLE=Most recent fights REPLAY_TITLE=Most recent fights
@ -650,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}

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

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