mirror of
https://github.com/TotalFreedomMC/TotalFreedomMod.git
synced 2024-09-29 04:43:13 +00:00
c4fce3f0f9
* Command_adminworld.java * Command_adventure.java * Command_banip.java * Command_blockedit.java * Command_blockpvp.java * Command_cage.java * Command_cartsit.java * Command_clearchat.java * Command_clearinventory.java * Command_commandlist.java * Command_creative.java * Command_deop.java * Command_deopall.java * Command_dispfill.java * Command_doom.java * Command_gcmd.java * Command_hubworld.java * Command_inspect.java * Command_list.java * Command_lockup.java * Command_manageshop.java * Command_manuallyverify.java * Command_masterbuilderworld.java * Command_mbconfig.java * Command_moblimiter.java * Command_mp44.java * Command_mute.java * Command_nickfilter.java * Command_op.java * Command_opall.java * Command_opme.java * Command_potion.java (Also corrected the inconsistent "player not found" message's color) * Command_rank.java * Command_ride.java * Command_saconfig.java * Command_scare.java * Command_setplayerlimit.java * Command_settotalvotes.java * Command_smite.java * Command_spectator.java * Command_survival.java * Command_unblockcmd.java * Command_uncage.java * Command_unmute.java * Command_verifynoadmin.java Here are some commands I added functionality to: * Command_dispfill.java: Added some code that hooks into the CoreProtect API to log the items being removed from and added into the dispensers. * Command_setlever.java: Added some code that hooks into the CoreProtect API to log the levers being interacted with. Here's a command I fixed a critical bug in: * Command_setlever.java
82 lines
2.5 KiB
Java
82 lines
2.5 KiB
Java
package me.totalfreedom.totalfreedommod.command;
|
|
|
|
import me.totalfreedom.totalfreedommod.banning.Ban;
|
|
import me.totalfreedom.totalfreedommod.rank.Rank;
|
|
import me.totalfreedom.totalfreedommod.util.FLog;
|
|
import me.totalfreedom.totalfreedommod.util.FUtil;
|
|
import org.apache.commons.lang.ArrayUtils;
|
|
import org.apache.commons.lang.StringUtils;
|
|
import org.bukkit.ChatColor;
|
|
import org.bukkit.command.Command;
|
|
import org.bukkit.command.CommandSender;
|
|
import org.bukkit.entity.Player;
|
|
|
|
@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH, blockHostConsole = true)
|
|
@CommandParameters(description = "Bans the specified ip.", usage = "/<command> <ip> [reason] [-q]")
|
|
public class Command_banip extends FreedomCommand
|
|
{
|
|
|
|
@Override
|
|
public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
|
|
{
|
|
if (args.length == 0)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
boolean silent = false;
|
|
|
|
String reason = null;
|
|
|
|
String ip = args[0];
|
|
|
|
if (FUtil.isValidIPv4(ip))
|
|
{
|
|
msg(ip + " is not a valid IP address", ChatColor.RED);
|
|
return true;
|
|
}
|
|
|
|
if (plugin.bm.getByIp(ip) != null)
|
|
{
|
|
msg("The IP " + ip + " is already banned", ChatColor.RED);
|
|
return true;
|
|
}
|
|
|
|
if (args[args.length - 1].equalsIgnoreCase("-q"))
|
|
{
|
|
silent = true;
|
|
|
|
if (args.length >= 2)
|
|
{
|
|
reason = StringUtils.join(ArrayUtils.subarray(args, 1, args.length - 1), " ");
|
|
}
|
|
}
|
|
else if (args.length > 1)
|
|
{
|
|
reason = StringUtils.join(ArrayUtils.subarray(args, 1, args.length), " ");
|
|
}
|
|
|
|
// Ban player
|
|
Ban ban = Ban.forPlayerIp(ip, sender, null, reason);
|
|
plugin.bm.addBan(ban);
|
|
|
|
// Kick player and handle others on IP
|
|
for (Player player : server.getOnlinePlayers())
|
|
{
|
|
if (FUtil.getIp(player).equals(ip))
|
|
{
|
|
player.kickPlayer(ban.bakeKickMessage());
|
|
}
|
|
|
|
if (!silent)
|
|
{
|
|
// Broadcast
|
|
FLog.info(ChatColor.RED + sender.getName() + " - Banned the IP " + ip);
|
|
String message = sender.getName() + " - Banned " + (plugin.al.isAdmin(player) ? "the IP " + ip : "an IP");
|
|
msg(player, message, ChatColor.RED);
|
|
}
|
|
}
|
|
|
|
return true;
|
|
}
|
|
} |