diff options
| author | Chris Ward <chris@chrisgward.com> | 2013-12-01 16:29:17 +1100 |
|---|---|---|
| committer | Chris Ward <chris@chrisgward.com> | 2013-12-01 16:29:17 +1100 |
| commit | 03e9a0d290bfdc3e654047350559f0a62652303b (patch) | |
| tree | 53ebd436d6057754ccd29bec13318201303ccdc0 | |
| parent | 88ed9f5d41e07ccd0caf670d062266b1aa07f86a (diff) | |
| download | Essentials-03e9a0d290bfdc3e654047350559f0a62652303b.tar Essentials-03e9a0d290bfdc3e654047350559f0a62652303b.tar.gz Essentials-03e9a0d290bfdc3e654047350559f0a62652303b.tar.lz Essentials-03e9a0d290bfdc3e654047350559f0a62652303b.tar.xz Essentials-03e9a0d290bfdc3e654047350559f0a62652303b.zip | |
Adds essentials.mute.notify
78e6da95043
| -rw-r--r-- | Essentials/src/net/ess3/commands/Commandmute.java | 40 | ||||
| -rw-r--r-- | Essentials/src/net/ess3/permissions/Permissions.java | 1 |
2 files changed, 34 insertions, 7 deletions
diff --git a/Essentials/src/net/ess3/commands/Commandmute.java b/Essentials/src/net/ess3/commands/Commandmute.java index ec24412e3..31d76a345 100644 --- a/Essentials/src/net/ess3/commands/Commandmute.java +++ b/Essentials/src/net/ess3/commands/Commandmute.java @@ -1,11 +1,13 @@ package net.ess3.commands; -import static net.ess3.I18n._; import net.ess3.api.IUser; import net.ess3.permissions.Permissions; import net.ess3.user.UserData.TimestampType; import net.ess3.utils.DateUtil; import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + +import static net.ess3.I18n._; public class Commandmute extends EssentialsCommand @@ -37,11 +39,35 @@ public class Commandmute extends EssentialsCommand } player.setTimestamp(TimestampType.MUTE, muteTimestamp); final boolean muted = player.getData().isMuted(); - sender.sendMessage( - muted ? (muteTimestamp > 0 ? _("§6Player {0} §6muted for {1}.", player.getPlayer().getDisplayName(), DateUtil.formatDateDiff(muteTimestamp)) : _( - "mutedPlayer", player.getPlayer().getDisplayName())) : _( - "unmutedPlayer", player.getPlayer().getDisplayName())); - player.sendMessage( - muted ? (muteTimestamp > 0 ? _("§6You have been muted for§c {0}.", DateUtil.formatDateDiff(muteTimestamp)) : _("§6You have been muted!")) : _("§6You have been unmuted.")); + + if(muted) + { + if(muteTimestamp > 0) + { + final String dateDiff = DateUtil.formatDateDiff(muteTimestamp); + sender.sendMessage(_("§6Player {0} §6muted for {1}.", player.getPlayer().getDisplayName(), dateDiff)); + player.sendMessage(_("§6You have been muted for§c {0}.", dateDiff)); + } + else + { + sender.sendMessage(_("mutedPlayer", player.getPlayer().getDisplayName())); + player.sendMessage("§6You have been muted!"); + } + for(Player onlinePlayer : ess.getServer().getOnlinePlayers()) + { + if(Permissions.MUTE_NOTIFY.isAuthorized(onlinePlayer)) + { + if(onlinePlayer != sender && onlinePlayer != player.getPlayer()) + { + onlinePlayer.sendMessage(_("§4{0} §6has muted §4{1}", sender.getName(), player.getPlayer().getDisplayName())); + } + } + } + } + else + { + sender.sendMessage(_("unmutedPlayer", player.getPlayer().getDisplayName())); + player.sendMessage(_("§6You have been unmuted.")); + } } } diff --git a/Essentials/src/net/ess3/permissions/Permissions.java b/Essentials/src/net/ess3/permissions/Permissions.java index 8a1ddb546..3a606fb77 100644 --- a/Essentials/src/net/ess3/permissions/Permissions.java +++ b/Essentials/src/net/ess3/permissions/Permissions.java @@ -78,6 +78,7 @@ public enum Permissions implements IPermission MOTD, MSG_COLOR, MUTE_EXEMPT, + MUTE_NOTIFY, NEAR_OTHERS, NICK_COLOR, NICK_OTHERS, |