diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java index 691372f50..71eff6fb7 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java @@ -80,7 +80,14 @@ public class EssentialsPlayerListener implements Listener { final User user = ess.getUser(event.getPlayer()); if (user.isMuted()) { event.setCancelled(true); - user.sendMessage(tl("voiceSilenced")); + + if (user.getMuteReason ().equals ("")) { + user.sendMessage(tl("voiceSilenced")); + } + else { + user.sendMessage(tl("voiceSilenced") + tl("muteFormat", user.getMuteReason ())); + } + LOGGER.info(tl("mutedUserSpeaks", user.getName(), event.getMessage())); } try { diff --git a/Essentials/src/com/earth2me/essentials/User.java b/Essentials/src/com/earth2me/essentials/User.java index e9035a8ef..623bce407 100644 --- a/Essentials/src/com/earth2me/essentials/User.java +++ b/Essentials/src/com/earth2me/essentials/User.java @@ -537,6 +537,7 @@ public class User extends UserData implements Comparable, IMessageRecipien setMuteTimeout(0); sendMessage(tl("canTalkAgain")); setMuted(false); + setMuteReason (""); return true; } } diff --git a/Essentials/src/com/earth2me/essentials/UserData.java b/Essentials/src/com/earth2me/essentials/UserData.java index e0bed142d..042d9b2c6 100644 --- a/Essentials/src/com/earth2me/essentials/UserData.java +++ b/Essentials/src/com/earth2me/essentials/UserData.java @@ -521,8 +521,12 @@ public abstract class UserData extends PlayerExtension implements IConf { } public void setMuteReason (String reason) { - muteReason = reason; - config.setProperty ("muteReason", reason); + if (reason.equals("")) { + config.removeProperty ("muteReason"); + } else { + muteReason = reason; + config.setProperty ("muteReason", reason); + } config.save(); } diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties index 96aa4c9dd..a48d41cf3 100644 --- a/Essentials/src/messages.properties +++ b/Essentials/src/messages.properties @@ -494,6 +494,7 @@ vanished=\u00a76You are now completely invisible to normal users, and hidden fro versionMismatch=\u00a74Version mismatch\! Please update {0} to the same version. versionMismatchAll=\u00a74Version mismatch\! Please update all Essentials jars to the same version. voiceSilenced=\u00a76Your voice has been silenced\! +muteFormat=\u00a74 Reason: {0} walking=walking warpDeleteError=\u00a74Problem deleting the warp file. warpList={0}