Merge branch 'development' into Wild1145-patch-1

This commit is contained in:
Ryan 2022-02-22 21:17:02 +00:00 committed by GitHub
commit e7992c7eb4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -130,17 +130,19 @@ public class Command_mute extends FreedomCommand
{
playerdata.setMuted(true);
player.sendTitle(ChatColor.RED + "You've been muted.", ChatColor.YELLOW + "Be sure to follow the rules!", 20, 100, 60);
if (quiet)
{
msg("Muted " + player.getName() + " quietly");
return true; // doesn't announce reason
}
FUtil.adminAction(sender.getName(), "Muting " + player.getName(), true);
if (reason != null)
{
msg(player, ChatColor.RED + "Reason: " + ChatColor.YELLOW + reason);
}
if (quiet)
{
msg("Muted " + player.getName() + " quietly");
return true;
}
FUtil.adminAction(sender.getName(), "Muting " + player.getName(), true);
if (smite)
{
@ -178,4 +180,4 @@ public class Command_mute extends FreedomCommand
return Collections.emptyList();
}
}
}