mirror of
https://github.com/AtlasMediaGroup/TotalFreedomMod.git
synced 2024-11-27 01:05:38 +00:00
Should work fingers crossed
This commit is contained in:
parent
dc10c40578
commit
9713fcabd6
@ -15,7 +15,7 @@ import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
|
||||
@CommandParameters(description = "Someone being a little bitch? Smite them down...", usage = "/<command> <player> [reason] [-nc | -q]")
|
||||
@CommandParameters(description = "Someone being a little bitch? Smite them down...", usage = "/<command> <player> [reason] [-c | -q]")
|
||||
public class Command_smite extends FreedomCommand
|
||||
{
|
||||
|
||||
@ -29,7 +29,7 @@ public class Command_smite extends FreedomCommand
|
||||
smite(sender, player, reason, false);
|
||||
}
|
||||
|
||||
public static void smite(CommandSender sender, Player player, String reason, Boolean silent)
|
||||
public static void smite(CommandSender sender, Player player, String reason, Boolean silent, Boolean clearinv)
|
||||
{
|
||||
player.sendTitle(ChatColor.RED + "You've been smitten.", ChatColor.YELLOW + "Be sure to follow the rules!", 20, 100, 60);
|
||||
|
||||
@ -54,7 +54,7 @@ public class Command_smite extends FreedomCommand
|
||||
player.setGameMode(GameMode.SURVIVAL);
|
||||
|
||||
// Clear inventory
|
||||
if (!args[args.length - 1].equalsIgnoreCase("-nc"))
|
||||
if (clearinv)
|
||||
{
|
||||
player.getInventory().clear();
|
||||
}
|
||||
@ -91,6 +91,7 @@ public class Command_smite extends FreedomCommand
|
||||
|
||||
String reason = null;
|
||||
boolean silent = false;
|
||||
boolean clearinv = false;
|
||||
if (args.length >= 2)
|
||||
{
|
||||
if (args[args.length - 1].equalsIgnoreCase("-q"))
|
||||
@ -106,6 +107,21 @@ public class Command_smite extends FreedomCommand
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if
|
||||
{
|
||||
if args[args.length - 1].equalsIgnoreCase("-c")
|
||||
{
|
||||
clearinv = true
|
||||
}
|
||||
|
||||
if (args.length >= 3)
|
||||
{
|
||||
reason = StringUtils.join(ArrayUtils.subarray(args, 1, args.length - 1), " ");
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
reason = StringUtils.join(ArrayUtils.subarray(args, 1, args.length), " ");
|
||||
}
|
||||
@ -119,7 +135,7 @@ public class Command_smite extends FreedomCommand
|
||||
return true;
|
||||
}
|
||||
|
||||
smite(sender, player, reason, silent);
|
||||
smite(sender, player, reason, silent, clearinv);
|
||||
|
||||
plugin.pul.logPunishment(new Punishment(player.getName(), FUtil.getIp(player), sender.getName(), PunishmentType.SMITE, reason));
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user