Merge pull request '@Player Highlighting Ignore Case' (#103) from at-player into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
Dieser Commit ist enthalten in:
Commit
28ce39efcd
@ -155,20 +155,26 @@ public class ChatListener extends BasicListener {
|
|||||||
message = ChatColor.translateAlternateColorCodes('&', message);
|
message = ChatColor.translateAlternateColorCodes('&', message);
|
||||||
}
|
}
|
||||||
|
|
||||||
String msg = name + "§7» " + chatcolor + message;
|
String msg = name + "§7»" + chatcolor + " " + message;
|
||||||
if(user.getTeam() != 0){
|
if(user.getTeam() != 0){
|
||||||
msg = "§8" + Team.get(user.getTeam()).getTeamKuerzel() + " §r" + msg;
|
msg = "§8" + Team.get(user.getTeam()).getTeamKuerzel() + " §r" + msg;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
String[] msgSplits = msg.split(" ");
|
||||||
|
StringBuilder builder = new StringBuilder();
|
||||||
|
|
||||||
for(ProxiedPlayer target : ProxyServer.getInstance().getPlayers()){
|
for(ProxiedPlayer target : ProxyServer.getInstance().getPlayers()){
|
||||||
Subserver targetServer = Subserver.getSubserver(target);
|
Subserver targetServer = Subserver.getSubserver(target);
|
||||||
if(targetServer == null || targetServer.getType() != Servertype.ARENA || targetServer.getServer() != target.getServer().getInfo()){
|
if(!(targetServer == null || targetServer.getType() != Servertype.ARENA || targetServer.getServer() != target.getServer().getInfo())) continue;
|
||||||
if(msg.contains("@" + target.getName())) {
|
for (String curr : msgSplits) {
|
||||||
BungeeCore.send(target, ChatMessageType.CHAT, msg.replace("@" + target.getName(), "§e@" + target.getName() + chatcolor));
|
if(curr.equalsIgnoreCase("@" + target.getName())) {
|
||||||
|
builder.append("§e@").append(target.getName()).append(chatcolor).append(" ");
|
||||||
}else {
|
}else {
|
||||||
BungeeCore.send(target, ChatMessageType.CHAT, msg);
|
builder.append(curr).append(" ");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
BungeeCore.send(target, ChatMessageType.CHAT, builder.toString());
|
||||||
|
builder = new StringBuilder();
|
||||||
}
|
}
|
||||||
BungeeCore.log(sender.getServer().getInfo(), msg);
|
BungeeCore.log(sender.getServer().getInfo(), msg);
|
||||||
}
|
}
|
||||||
@ -209,7 +215,7 @@ public class ChatListener extends BasicListener {
|
|||||||
last = "";
|
last = "";
|
||||||
for(ProxiedPlayer player : ProxyServer.getInstance().getPlayers()){
|
for(ProxiedPlayer player : ProxyServer.getInstance().getPlayers()){
|
||||||
String name = player.getName();
|
String name = player.getName();
|
||||||
if(last.isEmpty() || name.startsWith(last)){
|
if (last.isEmpty() || name.startsWith(last)) {
|
||||||
suggestions.add(name);
|
suggestions.add(name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
In neuem Issue referenzieren
Einen Benutzer sperren