AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2025-07-01 20:46:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

-q arg for more commands

Browse Source 
- add `-q` arg for tban, warn, and tempban
- add reasons to tban
(#259)
This commit is contained in:
speedxx
2020-08-07 20:51:47 -04:00
parent 86cf9dc344
commit 30d5a1d888
4 changed files with 132 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/main/java/me/totalfreedom/totalfreedommod/command/Command_warn.java
View File

@ -9,33 +9,40 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Warns the specified player.", usage = "/<command> <player> <reason>")
@CommandParameters(description = "Warns the specified player.", usage = "/<command> [-q] <player> <reason>")
public class Command_warn extends FreedomCommand
{
@Override
public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{
if (args.length < 2)
if (args.length == 0)
{
return false;
}
Player player = getPlayer(args[0]);
boolean quiet = args[0].equalsIgnoreCase("-q");
if (quiet)
{
args = org.apache.commons.lang3.ArrayUtils.subarray(args, 1, args.length);
if (args.length < 1)
{
return false;
}
}
Player player = getPlayer(args[0]);
if (player == null)
{
msg(PLAYER_NOT_FOUND);
return true;
}
if (sender instanceof Player)
if (playerSender == player)
{
if (player.equals(playerSender))
{
msg(ChatColor.RED + "Please, don't try to warn yourself.");
return true;
}
msg(ChatColor.RED + "Please, don't try to warn yourself.");
return true;
}
if (plugin.al.isAdmin(player))
@ -45,23 +52,26 @@ public class Command_warn extends FreedomCommand
}
String warnReason = StringUtils.join(ArrayUtils.subarray(args, 1, args.length), " ");
msg(player, ChatColor.RED + "[WARNING] You received a warning from " + sender.getName() + ": " + warnReason);
player.sendTitle(ChatColor.RED + "You've been warned.", ChatColor.YELLOW + "Reason: " + warnReason, 20, 100, 60);
msg(ChatColor.GREEN + "You have successfully warned " + player.getName());
final StringBuilder adminNotice = new StringBuilder()
.append(ChatColor.RED)
.append(sender.getName())
.append(" - ")
.append("Warning: ")
.append(player.getName())
.append(" - Reason: ")
.append(ChatColor.YELLOW)
.append(warnReason);
plugin.al.messageAllAdmins(adminNotice.toString());
if (quiet)
{
msg("Warned " + player.getName() + " quietly");
return true;
}
msg(player, ChatColor.RED + "[WARNING] You received a warning from " + sender.getName() + ": " + warnReason);
String adminNotice = ChatColor.RED +
sender.getName() +
" - " +
"Warning: " +
player.getName() +
" - Reason: " +
ChatColor.YELLOW +
warnReason;
plugin.al.messageAllAdmins(adminNotice);
plugin.pl.getPlayer(player).incrementWarnings();
return true;
}
}
}