From 265c8419208108505575f433627835cb6c5084ad Mon Sep 17 00:00:00 2001 From: MoBrot <90271578+MoBrot@users.noreply.github.com> Date: Sun, 19 Mar 2023 22:26:25 +0100 Subject: [PATCH 1/4] Add Code of Conduct to RegelnCommand --- src/de/steamwar/bungeecore/commands/RegelnCommand.java | 1 + src/de/steamwar/messages/BungeeCore.properties | 3 +++ src/de/steamwar/messages/BungeeCore_de.properties | 3 +++ 3 files changed, 7 insertions(+) diff --git a/src/de/steamwar/bungeecore/commands/RegelnCommand.java b/src/de/steamwar/bungeecore/commands/RegelnCommand.java index 63731a53..31643c97 100644 --- a/src/de/steamwar/bungeecore/commands/RegelnCommand.java +++ b/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))); } } diff --git a/src/de/steamwar/messages/BungeeCore.properties b/src/de/steamwar/messages/BungeeCore.properties index 1845f38f..a95129c5 100644 --- a/src/de/steamwar/messages/BungeeCore.properties +++ b/src/de/steamwar/messages/BungeeCore.properties @@ -353,6 +353,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=§eConduct rules +REGELN_CONDUCT_HOVER=§7https://steamwar.de/verhaltensrichtlinien/ +REGELN_CONDUCT_URL=https://steamwar.de/verhaltensrichtlinien/ #ReplayCommand REPLAY_TITLE=Most recent fights diff --git a/src/de/steamwar/messages/BungeeCore_de.properties b/src/de/steamwar/messages/BungeeCore_de.properties index d1f8a22a..47760d1e 100644 --- a/src/de/steamwar/messages/BungeeCore_de.properties +++ b/src/de/steamwar/messages/BungeeCore_de.properties @@ -337,6 +337,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 From 4b33bd80820a993e4d93d47faafc41fe7bf16f6a Mon Sep 17 00:00:00 2001 From: yoyosource Date: Mon, 17 Apr 2023 20:51:15 +0200 Subject: [PATCH 2/4] Update MsgCommand --- src/de/steamwar/bungeecore/commands/MsgCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/de/steamwar/bungeecore/commands/MsgCommand.java b/src/de/steamwar/bungeecore/commands/MsgCommand.java index 9bd550c9..ce9b8d79 100644 --- a/src/de/steamwar/bungeecore/commands/MsgCommand.java +++ b/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); } From 481d4a789232088e51a791cb51bf807f47619df4 Mon Sep 17 00:00:00 2001 From: MoBrot <90271578+MoBrot@users.noreply.github.com> Date: Thu, 20 Apr 2023 19:33:01 +0200 Subject: [PATCH 3/4] English translation --- src/de/steamwar/messages/BungeeCore.properties | 4 ++-- src/de/steamwar/messages/BungeeCore_de.properties | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/de/steamwar/messages/BungeeCore.properties b/src/de/steamwar/messages/BungeeCore.properties index a95129c5..f2357e12 100644 --- a/src/de/steamwar/messages/BungeeCore.properties +++ b/src/de/steamwar/messages/BungeeCore.properties @@ -353,8 +353,8 @@ 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=§eConduct rules -REGELN_CONDUCT_HOVER=§7https://steamwar.de/verhaltensrichtlinien/ +REGELN_CONDUCT=§eCode of conduct +REGELN_CONDUCT_HOVER=§7https://steamwar.de/verhaltensrichtlinien/ REGELN_CONDUCT_URL=https://steamwar.de/verhaltensrichtlinien/ #ReplayCommand diff --git a/src/de/steamwar/messages/BungeeCore_de.properties b/src/de/steamwar/messages/BungeeCore_de.properties index 47760d1e..6f51a1e0 100644 --- a/src/de/steamwar/messages/BungeeCore_de.properties +++ b/src/de/steamwar/messages/BungeeCore_de.properties @@ -337,8 +337,8 @@ 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=§eVerhaltensrichtlinien +REGELN_CONDUCT_HOVER=§7https://steamwar.de/verhaltensrichtlinien/ REGELN_CONDUCT_URL=https://steamwar.de/verhaltensrichtlinien/ #ReplayCommand From efc7a3fe48a5bae9c97d1c5465c8aa799939b0d8 Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Mon, 1 May 2023 10:10:25 +0200 Subject: [PATCH 4/4] 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.