From 02e4398301646166c8c58ea5200a9f207d9a19ca Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Fri, 5 Feb 2021 11:22:48 +0100 Subject: [PATCH 1/4] Fix Join not Found --- src/de/steamwar/messages/BungeeCore.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/de/steamwar/messages/BungeeCore.properties b/src/de/steamwar/messages/BungeeCore.properties index 84038b2a..6b85d535 100644 --- a/src/de/steamwar/messages/BungeeCore.properties +++ b/src/de/steamwar/messages/BungeeCore.properties @@ -227,6 +227,9 @@ CHECK_DECLINED_TEAM=§7Die Schematic §e{0} §7von §e{1} §awurde aufgrund von HISTORIC_BROADCAST=§7Historischer §e{0}§8-§7Kampf von §e{1}§8! HISTORIC_BROADCAST_HOVER=§aGegen §7{1} §ekämpfen +#JoinCommand +JOIN_PLAYER_BLOCK=§cDieser Spieler hat dich geblockt! + #JoinmeCommand JOINME_USAGE=§8/§7join §8[§eSpieler§8]. JOINME_BROADCAST=§7Klicke §ehier§8, §7um zu §e" + player.getName() + " §7auf §e" + player.getServer().getInfo().getName() + " §7zu kommen§8! From a840671ced66e926b2706ddce224e47ffdb20bfe Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Fri, 5 Feb 2021 11:23:57 +0100 Subject: [PATCH 2/4] Fix Challenge Broadcast --- src/de/steamwar/bungeecore/commands/ChallengeCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/de/steamwar/bungeecore/commands/ChallengeCommand.java b/src/de/steamwar/bungeecore/commands/ChallengeCommand.java index 9d293871..36f78351 100644 --- a/src/de/steamwar/bungeecore/commands/ChallengeCommand.java +++ b/src/de/steamwar/bungeecore/commands/ChallengeCommand.java @@ -80,7 +80,7 @@ public class ChallengeCommand extends BasicCommand { arena.sendPlayer(player); arena.sendPlayer(target); - Message.broadcast("CHALLENGE_BROADCAST", sender, true, "CHALLENGE_BROADCAST_HOVER", + Message.broadcast("CHALLENGE_BROADCAST", "CHALLENGE_BROADCAST_HOVER", new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/join " + player.getName()), mode.getDisplayName(), player.getDisplayName(), target.getDisplayName()); }else{ if(!challenges.containsKey(player)){ From 7e9cc37e2d04df105f171a1bce9928d4371dcf88 Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Fri, 5 Feb 2021 11:25:33 +0100 Subject: [PATCH 3/4] Fix Team and ServerTeamchatCommand --- src/de/steamwar/bungeecore/commands/ServerTeamchatCommand.java | 2 +- src/de/steamwar/bungeecore/commands/TeamchatCommand.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/de/steamwar/bungeecore/commands/ServerTeamchatCommand.java b/src/de/steamwar/bungeecore/commands/ServerTeamchatCommand.java index 96cf0def..90a6139d 100644 --- a/src/de/steamwar/bungeecore/commands/ServerTeamchatCommand.java +++ b/src/de/steamwar/bungeecore/commands/ServerTeamchatCommand.java @@ -56,7 +56,7 @@ public class ServerTeamchatCommand extends BasicCommand { for (ProxiedPlayer target : ProxyServer.getInstance().getPlayers()){ if ((target.hasPermission("bungeecore.teamchat")) && target.getChatMode() == ProxiedPlayer.ChatMode.SHOWN){ - Message.send("STC_FORMAT", target, sender.getName(), message); + Message.sendPrefixless("STC_FORMAT", target, sender.getName(), message); } } } diff --git a/src/de/steamwar/bungeecore/commands/TeamchatCommand.java b/src/de/steamwar/bungeecore/commands/TeamchatCommand.java index 6abdace3..f5d17f5e 100644 --- a/src/de/steamwar/bungeecore/commands/TeamchatCommand.java +++ b/src/de/steamwar/bungeecore/commands/TeamchatCommand.java @@ -59,7 +59,7 @@ public class TeamchatCommand extends BasicCommand { SteamwarUser targetuser = SteamwarUser.get(target.getUniqueId()); if (targetuser.getTeam() == user.getTeam() && target.getChatMode() == ProxiedPlayer.ChatMode.SHOWN){ - Message.send("TC_FORMAT", target, player.getName(), msg); + Message.sendPrefixless("TC_FORMAT", target, player.getName(), msg); } } } From 11c55d94199f1137b9ebd445d578be1a5c023e49 Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Fri, 5 Feb 2021 11:29:34 +0100 Subject: [PATCH 4/4] Fix JoinmeCommand --- src/de/steamwar/bungeecore/commands/JoinmeCommand.java | 2 +- src/de/steamwar/messages/BungeeCore.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/de/steamwar/bungeecore/commands/JoinmeCommand.java b/src/de/steamwar/bungeecore/commands/JoinmeCommand.java index 10f435ed..37fb8061 100644 --- a/src/de/steamwar/bungeecore/commands/JoinmeCommand.java +++ b/src/de/steamwar/bungeecore/commands/JoinmeCommand.java @@ -42,7 +42,7 @@ public class JoinmeCommand extends BasicCommand { if (args.length == 0 && player.hasPermission("bungeecore.joinme")) { Message.broadcast("JOINME_BROADCAST", "JOINME_BROADCAST_HOVER" - , new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/join " + player.getName())); + , new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/join " + player.getName()), player.getName(), player.getServer().getInfo().getName()); } else if (args.length == 1) { ProxiedPlayer target = ProxyServer.getInstance().getPlayer(args[0]); if(target == null || !target.isConnected()){ diff --git a/src/de/steamwar/messages/BungeeCore.properties b/src/de/steamwar/messages/BungeeCore.properties index 6b85d535..6679b9b2 100644 --- a/src/de/steamwar/messages/BungeeCore.properties +++ b/src/de/steamwar/messages/BungeeCore.properties @@ -232,7 +232,7 @@ JOIN_PLAYER_BLOCK=§cDieser Spieler hat dich geblockt! #JoinmeCommand JOINME_USAGE=§8/§7join §8[§eSpieler§8]. -JOINME_BROADCAST=§7Klicke §ehier§8, §7um zu §e" + player.getName() + " §7auf §e" + player.getServer().getInfo().getName() + " §7zu kommen§8! +JOINME_BROADCAST=§7Klicke §ehier§8, §7um zu §e{0} §7auf §e{1} §7zu kommen§8! JOINME_BROADCAST_HOVER=§aSpieler folgen JOINME_PLAYER_OFFLINE=§cDieser Spieler ist offline. JOINME_PLAYER_SELF=§cSei eins mit dir selbst!