diff options
| author | KHobbits <rob@khobbits.co.uk> | 2012-06-10 19:56:24 +0100 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2012-06-10 19:56:24 +0100 |
| commit | 0bbd094236d482aff5251a023c5b3102ed06bc26 (patch) | |
| tree | e91c3e1a10d640e501dc9412986c059b15ee4f3e | |
| parent | 555ec29f91500752eb6e50d6b4d6a68d4df98e4b (diff) | |
| download | Essentials-0bbd094236d482aff5251a023c5b3102ed06bc26.tar Essentials-0bbd094236d482aff5251a023c5b3102ed06bc26.tar.gz Essentials-0bbd094236d482aff5251a023c5b3102ed06bc26.tar.lz Essentials-0bbd094236d482aff5251a023c5b3102ed06bc26.tar.xz Essentials-0bbd094236d482aff5251a023c5b3102ed06bc26.zip | |
Fix /mute to follow same convention as /tjail
Fixed #2056
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/UserData.java | 10 | ||||
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/commands/Commandmute.java | 10 |
2 files changed, 9 insertions, 11 deletions
diff --git a/Essentials/src/com/earth2me/essentials/UserData.java b/Essentials/src/com/earth2me/essentials/UserData.java index e0f638fb0..97fa02a2b 100644 --- a/Essentials/src/com/earth2me/essentials/UserData.java +++ b/Essentials/src/com/earth2me/essentials/UserData.java @@ -493,10 +493,9 @@ public abstract class UserData extends PlayerExtension implements IConf config.setProperty("godmode", set); config.save(); } - private boolean muted; - private boolean getMuted() + public boolean getMuted() { return config.getBoolean("muted", false); } @@ -512,13 +511,6 @@ public abstract class UserData extends PlayerExtension implements IConf config.setProperty("muted", set); config.save(); } - - public boolean toggleMuted() - { - boolean ret = !isMuted(); - setMuted(ret); - return ret; - } private long muteTimeout; private long _getMuteTimeout() diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmute.java b/Essentials/src/com/earth2me/essentials/commands/Commandmute.java index 3e70cc507..fa86a8a02 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandmute.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandmute.java @@ -28,13 +28,19 @@ public class Commandmute extends EssentialsCommand throw new Exception(_("muteExempt")); } long muteTimestamp = 0; + if (args.length > 1) { - String time = getFinalArg(args, 1); + final String time = getFinalArg(args, 1); muteTimestamp = Util.parseDateDiff(time, true); + player.setMuted(true); + } + else + { + player.setMuted(!player.getMuted()); } player.setMuteTimeout(muteTimestamp); - final boolean muted = player.toggleMuted(); + final boolean muted = player.getMuted(); sender.sendMessage( muted ? (muteTimestamp > 0 |