mute & unmute improvements

- fix muted player messages being sent to discord
- fix mute sending 2 messages
- tell sender target has been unmuted
This commit is contained in:
speedxx
2020-07-17 19:54:46 -04:00
parent 5a41632654
commit cb1c67e568
3 changed files with 11 additions and 17 deletions

View File

@ -142,8 +142,6 @@ public class Command_mute extends FreedomCommand
FUtil.adminAction(sender.getName(), "Muting " + player.getName(), true);
msg(player, "You have been muted by " + ChatColor.YELLOW + sender.getName(), ChatColor.RED);
if (smite)
{
Command_smite.smite(sender, player, reason);
@ -180,4 +178,4 @@ public class Command_mute extends FreedomCommand
return Collections.emptyList();
}
}
}

View File

@ -42,28 +42,25 @@ public class Command_unmute extends FreedomCommand
}
FPlayer playerdata = plugin.pl.getPlayer(player);
if (plugin.al.isAdmin(player))
{
msg(player.getName() + " is an admin, and can't be muted.");
return true;
}
if (playerdata.isMuted())
{
playerdata.setMuted(false);
msg(player, "You have been unmuted.", ChatColor.RED);
player.sendTitle(ChatColor.RED + "You've been unmuted.", ChatColor.YELLOW + "Be sure to follow the rules!", 20, 100, 60);
if (!quiet)
if (quiet)
{
FUtil.adminAction(sender.getName(), "Unmuting " + player.getName(), true);
msg("Unmuted " + player.getName() + " quietly");
return true;
}
return true;
FUtil.adminAction(sender.getName(), "Unmuting " + player.getName(), true);
msg("Unmuted " + player.getName());
msg(player, "You have been unmuted.", ChatColor.RED);
}
else
{
msg(ChatColor.RED + "That player is not muted.");
}
return true;
}
}
}