Merge pull request 'Message Fixing' (#174) from moreML into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
Dieser Commit ist enthalten in:
Commit
7bc1751ed7
@ -80,7 +80,7 @@ public class ChallengeCommand extends BasicCommand {
|
|||||||
arena.sendPlayer(player);
|
arena.sendPlayer(player);
|
||||||
arena.sendPlayer(target);
|
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());
|
new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/join " + player.getName()), mode.getDisplayName(), player.getDisplayName(), target.getDisplayName());
|
||||||
}else{
|
}else{
|
||||||
if(!challenges.containsKey(player)){
|
if(!challenges.containsKey(player)){
|
||||||
|
@ -42,7 +42,7 @@ public class JoinmeCommand extends BasicCommand {
|
|||||||
|
|
||||||
if (args.length == 0 && player.hasPermission("bungeecore.joinme")) {
|
if (args.length == 0 && player.hasPermission("bungeecore.joinme")) {
|
||||||
Message.broadcast("JOINME_BROADCAST", "JOINME_BROADCAST_HOVER"
|
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) {
|
} else if (args.length == 1) {
|
||||||
ProxiedPlayer target = ProxyServer.getInstance().getPlayer(args[0]);
|
ProxiedPlayer target = ProxyServer.getInstance().getPlayer(args[0]);
|
||||||
if(target == null || !target.isConnected()){
|
if(target == null || !target.isConnected()){
|
||||||
|
@ -56,7 +56,7 @@ public class ServerTeamchatCommand extends BasicCommand {
|
|||||||
for (ProxiedPlayer target : ProxyServer.getInstance().getPlayers()){
|
for (ProxiedPlayer target : ProxyServer.getInstance().getPlayers()){
|
||||||
if ((target.hasPermission("bungeecore.teamchat"))
|
if ((target.hasPermission("bungeecore.teamchat"))
|
||||||
&& target.getChatMode() == ProxiedPlayer.ChatMode.SHOWN){
|
&& target.getChatMode() == ProxiedPlayer.ChatMode.SHOWN){
|
||||||
Message.send("STC_FORMAT", target, sender.getName(), message);
|
Message.sendPrefixless("STC_FORMAT", target, sender.getName(), message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -59,7 +59,7 @@ public class TeamchatCommand extends BasicCommand {
|
|||||||
SteamwarUser targetuser = SteamwarUser.get(target.getUniqueId());
|
SteamwarUser targetuser = SteamwarUser.get(target.getUniqueId());
|
||||||
if (targetuser.getTeam() == user.getTeam()
|
if (targetuser.getTeam() == user.getTeam()
|
||||||
&& target.getChatMode() == ProxiedPlayer.ChatMode.SHOWN){
|
&& target.getChatMode() == ProxiedPlayer.ChatMode.SHOWN){
|
||||||
Message.send("TC_FORMAT", target, player.getName(), msg);
|
Message.sendPrefixless("TC_FORMAT", target, player.getName(), msg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -227,9 +227,12 @@ 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=§7Historischer §e{0}§8-§7Kampf von §e{1}§8!
|
||||||
HISTORIC_BROADCAST_HOVER=§aGegen §7{1} §ekämpfen
|
HISTORIC_BROADCAST_HOVER=§aGegen §7{1} §ekämpfen
|
||||||
|
|
||||||
|
#JoinCommand
|
||||||
|
JOIN_PLAYER_BLOCK=§cDieser Spieler hat dich geblockt!
|
||||||
|
|
||||||
#JoinmeCommand
|
#JoinmeCommand
|
||||||
JOINME_USAGE=§8/§7join §8[§eSpieler§8].
|
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_BROADCAST_HOVER=§aSpieler folgen
|
||||||
JOINME_PLAYER_OFFLINE=§cDieser Spieler ist offline.
|
JOINME_PLAYER_OFFLINE=§cDieser Spieler ist offline.
|
||||||
JOINME_PLAYER_SELF=§cSei eins mit dir selbst!
|
JOINME_PLAYER_SELF=§cSei eins mit dir selbst!
|
||||||
|
In neuem Issue referenzieren
Einen Benutzer sperren