Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2025-01-10 10:28:22 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'mutes385' of https://github.com/delbertina/Essentials into final_mute_reason_issue#385

Browse Source
This commit is contained in:
CreedTheFreak 2017-12-16 22:27:52 -08:00
commit adf1bc291c
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Essentials/src/com/earth2me/essentials/commands/Commandafk.java
View File

@ -52,7 +52,7 @@ public class Commandafk extends EssentialsCommand {
if (message != null && sender != null) {
if (sender.isMuted()) {
throw new Exception(tl("voiceSilenced") + (sender.hasMuteReason() ?
tl("muteReason", sender.getMuteReason()) : ""));
(" " + tl("muteReason", sender.getMuteReason())) : ""));
}
if (!sender.isAuthorized("essentials.afk.message")) {
throw new Exception(tl("noPermToAFKMessage"));

2
Essentials/src/com/earth2me/essentials/commands/Commandmail.java
View File

@ -49,7 +49,7 @@ public class Commandmail extends EssentialsCommand {
if (user.isMuted()) {
throw new Exception(tl("voiceSilenced") + (user.hasMuteReason() ?
tl("muteReason", user.getMuteReason()) : ""));
(" " + tl("muteReason", user.getMuteReason())) : ""));
}
User u = getPlayer(server, args[1], true, true);

2
Essentials/src/com/earth2me/essentials/commands/Commandme.java
View File

@ -25,7 +25,7 @@ public class Commandme extends EssentialsCommand {
public void run(Server server, User user, String commandLabel, String[] args) throws Exception {
if (user.isMuted()) {
throw new Exception(tl("voiceSilenced") + (user.hasMuteReason() ?
tl("muteReason", user.getMuteReason()) : ""));
(" " + tl("muteReason", user.getMuteReason())) : ""));
}
if (args.length < 1) {

12
Essentials/src/com/earth2me/essentials/commands/Commandmute.java
View File

@ -83,8 +83,8 @@ public class Commandmute extends EssentialsCommand {
sender.sendMessage(tl("mutedPlayerFor", user.getDisplayName(), muteTime));
user.sendMessage(tl("playerMutedFor", muteTime));
} else {
sender.sendMessage(tl("mutedPlayerFor", user.getDisplayName(), muteTime) + tl("muteReason",user.getMuteReason()));
user.sendMessage(tl("playerMutedFor", muteTime) + tl("muteReason",user.getMuteReason()));
sender.sendMessage(tl("mutedPlayerFor", user.getDisplayName(), muteTime) + " " + tl("muteReason",user.getMuteReason()));
user.sendMessage(tl("playerMutedFor", muteTime) + " " + tl("muteReason",user.getMuteReason()));
}
} else {
if (user.getMuteReason ().equals ("")) {
@ -93,9 +93,9 @@ public class Commandmute extends EssentialsCommand {
user.sendMessage(tl("playerMuted"));
}
else {
sender.sendMessage(tl("mutedPlayer", user.getDisplayName()) + tl("muteReason",user.getMuteReason()));
sender.sendMessage(tl("mutedPlayer", user.getDisplayName()) + " " + tl("muteReason",user.getMuteReason()));
/** Send the player a message, why they were muted **/
user.sendMessage(tl("playerMuted")+ tl("muteReason",user.getMuteReason()));
user.sendMessage(tl("playerMuted") + " " + tl("muteReason",user.getMuteReason()));
}
}
final String message;
@ -104,14 +104,14 @@ public class Commandmute extends EssentialsCommand {
message = tl("muteNotifyFor", sender.getSender().getName(), user.getName(), muteTime);
}
else {
message = (tl("muteNotifyFor", sender.getSender().getName(), user.getName(), muteTime) + tl("muteReason",user.getMuteReason()));
message = (tl("muteNotifyFor", sender.getSender().getName(), user.getName(), muteTime) + " " + tl("muteReason",user.getMuteReason()));
}
} else {
if (user.getMuteReason ().equals ("")) {
message = tl("muteNotify", sender.getSender().getName(), user.getName());
}
else {
message = (tl("muteNotify", sender.getSender().getName(), user.getName()) + tl("muteReason",user.getMuteReason()));
message = (tl("muteNotify", sender.getSender().getName(), user.getName()) + " " + tl("muteReason",user.getMuteReason()));
}
}
server.getLogger().log(Level.INFO, message);

2
Essentials/src/com/earth2me/essentials/commands/Commandr.java
View File

@ -29,7 +29,7 @@ public class Commandr extends EssentialsCommand {
if (user.isMuted()) {
throw new Exception(tl("voiceSilenced") + (user.hasMuteReason() ?
tl("muteReason", user.getMuteReason()) : ""));
(" " + tl("muteReason", user.getMuteReason())) : ""));
}
message = FormatUtil.formatMessage(user, "essentials.msg", message);

2
Essentials/src/com/earth2me/essentials/commands/Commandseen.java
View File

@ -118,7 +118,7 @@ public class Commandseen extends EssentialsCommand {
}
if (user.isMuted()) {
throw new Exception(tl("whoisMuted", (user.getMuteTimeout() > 0 ? DateUtil.formatDateDiff(user.getMuteTimeout()) : tl("true"))) + (user.hasMuteReason() ?
tl("muteReason", user.getMuteReason()) : ""));
(" " + tl("muteReason", user.getMuteReason())) : ""));
}
final String location = user.getGeoLocation();
if (location != null && (!(sender.isPlayer()) || ess.getUser(sender.getPlayer()).isAuthorized("essentials.geoip.show"))) {

2
Essentials/src/com/earth2me/essentials/commands/Commandwhois.java
View File

@ -57,7 +57,7 @@ public class Commandwhois extends EssentialsCommand {
}
sender.sendMessage(tl("whoisJail", (user.isJailed() ? user.getJailTimeout() > 0 ? DateUtil.formatDateDiff(user.getJailTimeout()) : tl("true") : tl("false"))));
throw new Exception(tl("voiceSilenced") + (user.hasMuteReason() ?
tl("muteReason", user.getMuteReason()) : ""));
(" " + tl("muteReason", user.getMuteReason())) : ""));
}
@Override