diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java index 3a6b5868b..c52d9631e 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java @@ -81,12 +81,8 @@ public class EssentialsPlayerListener implements Listener { if (user.isMuted()) { event.setCancelled(true); - if (user.getMuteReason().equals ("")) { - user.sendMessage(tl("voiceSilenced")); - } - else { - user.sendMessage(tl("voiceSilenced") + tl("muteReason", user.getMuteReason ())); - } + user.sendMessage(tl("voiceSilenced") + (user.hasMuteReason() ? + (" " + tl("muteReason", user.getMuteReason())) : "")); LOGGER.info(tl("mutedUserSpeaks", user.getName(), event.getMessage())); } diff --git a/Essentials/src/com/earth2me/essentials/UserData.java b/Essentials/src/com/earth2me/essentials/UserData.java index 85b98dcbb..58fd43b44 100644 --- a/Essentials/src/com/earth2me/essentials/UserData.java +++ b/Essentials/src/com/earth2me/essentials/UserData.java @@ -537,7 +537,7 @@ public abstract class UserData extends PlayerExtension implements IConf { } public boolean hasMuteReason(){ - return getMuteReason().equals(""); + return !getMuteReason().equals(""); } private long muteTimeout; diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandafk.java b/Essentials/src/com/earth2me/essentials/commands/Commandafk.java index 0206dd00e..df5847274 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandafk.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandafk.java @@ -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")); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmail.java b/Essentials/src/com/earth2me/essentials/commands/Commandmail.java index 5e4e5bbf3..a9e188a93 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandmail.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandmail.java @@ -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); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandme.java b/Essentials/src/com/earth2me/essentials/commands/Commandme.java index f41f09d0e..8e954e927 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandme.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandme.java @@ -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) { diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmute.java b/Essentials/src/com/earth2me/essentials/commands/Commandmute.java index 1fa988832..b87ecc07d 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandmute.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandmute.java @@ -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); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandr.java b/Essentials/src/com/earth2me/essentials/commands/Commandr.java index 9b997ca1f..2e251c666 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandr.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandr.java @@ -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); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandseen.java b/Essentials/src/com/earth2me/essentials/commands/Commandseen.java index 41a8f0501..601044f97 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandseen.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandseen.java @@ -117,8 +117,8 @@ public class Commandseen extends EssentialsCommand { sender.sendMessage(tl("whoisJail", (user.getJailTimeout() > 0 ? DateUtil.formatDateDiff(user.getJailTimeout()) : tl("true")))); } if (user.isMuted()) { - throw new Exception(tl("whoisMuted", (user.getMuteTimeout() > 0 ? DateUtil.formatDateDiff(user.getMuteTimeout()) : tl("true"))) + (user.hasMuteReason() ? - tl("muteReason", user.getMuteReason()) : "")); + sender.sendMessage(tl("whoisMuted", (user.getMuteTimeout() > 0 ? DateUtil.formatDateDiff(user.getMuteTimeout()) : tl("true"))) + (user.hasMuteReason() ? + (" " + tl("muteReason", user.getMuteReason())) : "")); } final String location = user.getGeoLocation(); if (location != null && (!(sender.isPlayer()) || ess.getUser(sender.getPlayer()).isAuthorized("essentials.geoip.show"))) { diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java b/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java index d9598f77c..be4d65c78 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java @@ -56,8 +56,8 @@ public class Commandwhois extends EssentialsCommand { sender.sendMessage(tl("whoisAFK", tl("false"))); } 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()) : "")); + sender.sendMessage(tl("whoisMuted") + (user.hasMuteReason() ? + (" " + tl("muteReason", user.getMuteReason())) : "")); } @Override