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

Merge pull request 'Fix MsgCommand and RCommand' (#176) from moreML into master

Quellcode durchsuchen 
Reviewed-by: Lixfel <lixfel@steamwar.de>
Dieser Commit ist enthalten in:
Lixfel 2021-02-05 11:57:02 +01:00
Commit 2c55a89bbb
4 geänderte Dateien mit 8 neuen und 8 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

6
src/de/steamwar/bungeecore/commands/BauCommand.java
Datei anzeigen

@ -134,7 +134,7 @@ public class BauCommand {
ProxiedPlayer z = ProxyServer.getInstance().getPlayer(target.getUuid()); ProxiedPlayer z = ProxyServer.getInstance().getPlayer(target.getUuid());
if(z != null) if(z != null)
Message.send("BAU_ADDMEMBER_ADDED_TARGET", p, p.getName()); Message.send("BAU_ADDMEMBER_ADDED_TARGET", z, p.getName());
} }
private static void teleport(ProxiedPlayer p, String[] command){ private static void teleport(ProxiedPlayer p, String[] command){
@ -316,11 +316,11 @@ public class BauCommand {
if(permission){ if(permission){
if(player != null) if(player != null)
Message.send("BAU_MEMBER_TOGGLE_TARGET", p, p.getName(), what); Message.send("BAU_MEMBER_TOGGLE_TARGET", player, p.getName(), what);
Message.send("BAU_MEMBER_TOGGLE", p, what); Message.send("BAU_MEMBER_TOGGLE", p, what);
}else{ }else{
if(player != null) if(player != null)
Message.send("BAU_MEMBER_TOGGLE_TARGET_OFF", p, p.getName(), what); Message.send("BAU_MEMBER_TOGGLE_TARGET_OFF", player, p.getName(), what);
Message.send("BAU_MEMBER_TOGGLE_OFF", p, what); Message.send("BAU_MEMBER_TOGGLE_OFF", p, what);
} }
} }

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

@ -72,8 +72,8 @@ public class MsgCommand extends BasicCommand {
for (int i = 1; i < args.length; i++){ for (int i = 1; i < args.length; i++){
msgBuilder.append(args[i]).append(" "); msgBuilder.append(args[i]).append(" ");
} }
Message.send("MSG_FORMAT", player, player.getName(), target.getName(), msgBuilder.toString()); Message.sendPrefixless("MSG_FORMAT", player, player.getName(), target.getName(), msgBuilder.toString());
Message.send("MSG_FORMAT", target, player.getName(), target.getName(), msgBuilder.toString()); Message.sendPrefixless("MSG_FORMAT", target, player.getName(), target.getName(), msgBuilder.toString());
BungeeCore.log(Message.parse("MSG_FORMAT", player, player.getName(), target.getName(), msgBuilder.toString())); BungeeCore.log(Message.parse("MSG_FORMAT", player, player.getName(), target.getName(), msgBuilder.toString()));
lastChats.put(player, target); lastChats.put(player, target);

4
src/de/steamwar/bungeecore/commands/RCommand.java
Datei anzeigen

@ -69,8 +69,8 @@ public class RCommand extends BasicCommand {
for (String arg : args){ for (String arg : args){
msgBuilder.append(arg).append(" "); msgBuilder.append(arg).append(" ");
} }
Message.send("MSG_FORMAT", player, player.getName(), target.getName(), msgBuilder.toString()); Message.sendPrefixless("MSG_FORMAT", player, player.getName(), target.getName(), msgBuilder.toString());
Message.send("MSG_FORMAT", target, player.getName(), target.getName(), msgBuilder.toString()); Message.sendPrefixless("MSG_FORMAT", target, player.getName(), target.getName(), msgBuilder.toString());
BungeeCore.log(Message.parse("MSG_FORMAT", player, player.getName(), target.getName(), msgBuilder.toString())); BungeeCore.log(Message.parse("MSG_FORMAT", player, player.getName(), target.getName(), msgBuilder.toString()));
lastChats.put(target, player); lastChats.put(target, player);

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

@ -387,7 +387,7 @@ TEAM_INFO_EVENTS=§7Events§8: §e{0}
TEAM_LIST_NOT_PAGE=§cKeine Seitenzahl angegeben TEAM_LIST_NOT_PAGE=§cKeine Seitenzahl angegeben
TEAM_LIST_UNKNOWN_PAGE=§cUngültige Seitenzahl angegeben TEAM_LIST_UNKNOWN_PAGE=§cUngültige Seitenzahl angegeben
TEAM_LIST_HEADER=§7§lTeamliste §7{0}§8/§7{1} TEAM_LIST_HEADER=§7§lTeamliste §7{0}§8/§7{1}
TEAM_LIST_TEAM=§{0}{1} §e{2} §8[§7{3}}§8] TEAM_LIST_TEAM=§{0}{1} §e{2} §8[§7{3}§8]
TEAM_LIST_TEAM_HOVER=§7Teaminfo TEAM_LIST_TEAM_HOVER=§7Teaminfo
TEAM_LIST_PAGE=Seite TEAM_LIST_PAGE=Seite
TEAM_LIST_NEXT=§eNächste Seite TEAM_LIST_NEXT=§eNächste Seite