Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-07-01 00:54:56 +02:00
Code Issues Projects Releases Wiki Activity

Fix /mute to follow same convention as /tjail

Browse Source 
Fixed #2056
This commit is contained in:
KHobbits 2012-06-10 19:56:24 +01:00
parent dd7f1bcf25
commit 20d439578b
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Essentials/src/com/earth2me/essentials/UserData.java
View File

@ -493,10 +493,9 @@ public abstract class UserData extends PlayerExtension implements IConf
config.setProperty("godmode", set); config.setProperty("godmode", set);
config.save(); config.save();
} }
private boolean muted; private boolean muted;
private boolean getMuted() public boolean getMuted()
{ {
return config.getBoolean("muted", false); return config.getBoolean("muted", false);
} }
@ -512,13 +511,6 @@ public abstract class UserData extends PlayerExtension implements IConf
config.setProperty("muted", set); config.setProperty("muted", set);
config.save(); config.save();
} }
public boolean toggleMuted()
{
boolean ret = !isMuted();
setMuted(ret);
return ret;
}
private long muteTimeout; private long muteTimeout;
private long _getMuteTimeout() private long _getMuteTimeout()

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

@ -28,13 +28,19 @@ public class Commandmute extends EssentialsCommand
throw new Exception(_("muteExempt")); throw new Exception(_("muteExempt"));
} }
long muteTimestamp = 0; long muteTimestamp = 0;
if (args.length > 1) if (args.length > 1)
{ {
String time = getFinalArg(args, 1); final String time = getFinalArg(args, 1);
muteTimestamp = Util.parseDateDiff(time, true); muteTimestamp = Util.parseDateDiff(time, true);
player.setMuted(true);
}
else
{
player.setMuted(!player.getMuted());
} }
player.setMuteTimeout(muteTimestamp); player.setMuteTimeout(muteTimestamp);
final boolean muted = player.toggleMuted(); final boolean muted = player.getMuted();
sender.sendMessage( sender.sendMessage(
muted muted
? (muteTimestamp > 0 ? (muteTimestamp > 0