From 742450d016f184f0431eb8456aba410838111608 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 5 May 2014 15:31:12 +0200 Subject: [PATCH 1/3] Convert stop/remove to string literals. Resolves #168 Removed TFM_Util.isStopCommand(String) and TFM_Util.isRemoveCommand(String) --- buildnumber.properties | 4 +-- .../Commands/Command_adminworld.java | 4 +-- .../Commands/Command_cage.java | 6 ++-- .../Commands/Command_enchant.java | 9 +---- .../Commands/Command_jumppads.java | 6 ++-- .../Commands/Command_lockdown.java | 34 ------------------- .../Commands/Command_lockup.java | 2 +- .../Commands/Command_logs.java | 3 +- .../Commands/Command_nicknyan.java | 2 +- .../Commands/Command_orbit.java | 7 ++-- .../Commands/Command_protectarea.java | 2 +- .../Commands/Command_saconfig.java | 2 +- .../TotalFreedomMod/Commands/Command_tag.java | 2 +- .../Commands/Command_toggle.java | 9 +++++ .../Commands/Command_tossmob.java | 5 +-- .../Commands/Command_trail.java | 2 +- .../Commands/Command_whitelist.java | 2 +- .../TotalFreedomMod/TFM_Util.java | 12 ------- 18 files changed, 35 insertions(+), 78 deletions(-) delete mode 100644 src/me/StevenLawson/TotalFreedomMod/Commands/Command_lockdown.java diff --git a/buildnumber.properties b/buildnumber.properties index 12c1a33d..355dd791 100644 --- a/buildnumber.properties +++ b/buildnumber.properties @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Mon May 05 14:23:17 CEST 2014 -build.number=820 +#Mon May 05 15:29:34 CEST 2014 +build.number=821 diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_adminworld.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_adminworld.java index 615a921d..8c29ec33 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_adminworld.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_adminworld.java @@ -130,9 +130,9 @@ public class Command_adminworld extends TFM_Command playerMsg("Could not add player to guest list."); } } - else if (TFM_Util.isRemoveCommand(args[1])) + else if ("remove".equals(args[1])) { - Player player = TFM_AdminWorld.getInstance().removeGuest(args[2]); + final Player player = TFM_AdminWorld.getInstance().removeGuest(args[2]); if (player != null) { TFM_Util.adminAction(sender.getName(), "AdminWorld guest removed: " + player.getName(), false); diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cage.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cage.java index 9ba426bd..07410b17 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cage.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cage.java @@ -22,7 +22,7 @@ public class Command_cage extends TFM_Command return false; } - if (TFM_Util.isStopCommand(args[0]) && sender instanceof Player) + if ("off".equals(args[0]) && sender instanceof Player) { TFM_Util.adminAction(sender.getName(), "Uncaging " + sender.getName(), true); TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(sender_p); @@ -33,7 +33,7 @@ public class Command_cage extends TFM_Command return true; } - else if ("purge".equalsIgnoreCase(args[0])) + else if ("purge".equals(args[0])) { TFM_Util.adminAction(sender.getName(), "Uncaging all players.", true); @@ -63,7 +63,7 @@ public class Command_cage extends TFM_Command if (args.length >= 2) { - if (TFM_Util.isStopCommand(args[1])) + if ("off".equals(args[1])) { TFM_Util.adminAction(sender.getName(), "Uncaging " + player.getName(), true); diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_enchant.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_enchant.java index cb0ed6a0..a153a3ce 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_enchant.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_enchant.java @@ -55,13 +55,6 @@ public class Command_enchant extends TFM_Command { for (Enchantment ench : Enchantment.values()) { - /* - 2013-07-20 23:17:13 [INFO] [TotalFreedomMod]: Command Error: enchant - java.lang.NullPointerException - at net.minecraft.server.v1_6_R2.EnchantmentDurability.canEnchant(SourceFile:33) - at org.bukkit.craftbukkit.v1_6_R2.enchantments.CraftEnchantment.canEnchantItem(CraftEnchantment.java:55) - at me.StevenLawson.TotalFreedomMod.Commands.Command_enchant.run(Command_enchant.java:56) - */ try { if (ench.canEnchantItem(itemInHand)) @@ -122,7 +115,7 @@ public class Command_enchant extends TFM_Command playerMsg("Can't use this enchantment on held item."); } } - else if (TFM_Util.isRemoveCommand(args[0])) + else if (args[0].equals("remove")) { itemInHand.removeEnchantment(ench); diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_jumppads.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_jumppads.java index d56c7bf1..6572a4a7 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_jumppads.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_jumppads.java @@ -8,7 +8,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH) -@CommandParameters(description = "Manage jumppads", usage = "/ | strength >", aliases = "launchpads,jp") +@CommandParameters(description = "Manage jumppads", usage = "/ | strength >", aliases = "launchpads,jp") public class Command_jumppads extends TFM_Command { @Override @@ -29,7 +29,7 @@ public class Command_jumppads extends TFM_Command return true; } - if (TFM_Util.isStopCommand(args[0])) + if ("off".equals(args[0])) { TFM_Util.adminAction(sender.getName(), "Disabling Jumppads", false); TFM_Jumppads.getInstance().setMode(TFM_Jumppads.JumpPadMode.OFF); @@ -50,7 +50,7 @@ public class Command_jumppads extends TFM_Command if (args[0].equalsIgnoreCase("sideways")) { - if (TFM_Util.isStopCommand(args[1])) + if ("off".equals(args[1])) { TFM_Util.adminAction(sender.getName(), "Setting Jumppads mode to: Madgeek", false); TFM_Jumppads.getInstance().setMode(TFM_Jumppads.JumpPadMode.MADGEEK); diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lockdown.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lockdown.java deleted file mode 100644 index a0abcbc8..00000000 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lockdown.java +++ /dev/null @@ -1,34 +0,0 @@ -package me.StevenLawson.TotalFreedomMod.Commands; - -import me.StevenLawson.TotalFreedomMod.TFM_Util; -import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH) -@CommandParameters(description = "Prevents new players from joining the server", usage = "/ ") -public class Command_lockdown extends TFM_Command -{ - @Override - public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) - { - if (args.length != 1) - { - return false; - } - - if (TFM_Util.isStopCommand(args[0])) - { - TFM_Util.adminAction(sender.getName(), "De-activating server lockdown", true); - TotalFreedomMod.lockdownEnabled = false; - } - else - { - TFM_Util.adminAction(sender.getName(), "Activating server lockdown", true); - TotalFreedomMod.lockdownEnabled = true; - } - - return true; - } -} diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lockup.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lockup.java index 50db1202..170cca2b 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lockup.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lockup.java @@ -59,7 +59,7 @@ public class Command_lockup extends TFM_Command startLockup(player); playerMsg("Locked up " + player.getName() + "."); } - else if (TFM_Util.isStopCommand(args[1])) + else if ("off".equals(args[1])) { final Player player = getPlayer(args[0]); diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_logs.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_logs.java index 20795431..4214dfbc 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_logs.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_logs.java @@ -12,7 +12,6 @@ import java.util.Map.Entry; import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry; import me.StevenLawson.TotalFreedomMod.TFM_Log; import me.StevenLawson.TotalFreedomMod.TFM_Admin; -import me.StevenLawson.TotalFreedomMod.TFM_Util; import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; import net.minecraft.util.org.apache.commons.lang3.StringUtils; import org.bukkit.ChatColor; @@ -32,7 +31,7 @@ public class Command_logs extends TFM_Command if (args.length == 1) { - mode = (TFM_Util.isStopCommand(args[0]) ? LogsRegistrationMode.DELETE : LogsRegistrationMode.UPDATE); + mode = ("off".equals(args[0]) ? LogsRegistrationMode.DELETE : LogsRegistrationMode.UPDATE); } updateLogsRegistration(sender, sender_p, mode); diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_nicknyan.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_nicknyan.java index 0f8c31e1..a7eba0de 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_nicknyan.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_nicknyan.java @@ -19,7 +19,7 @@ public class Command_nicknyan extends TFM_Command return false; } - if (TFM_Util.isStopCommand(args[0])) + if ("off".equals(args[0])) { TFM_EssentialsBridge.getInstance().setNickname(sender.getName(), null); playerMsg("Nickname cleared."); diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_orbit.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_orbit.java index 0fded76b..9e8ad5a7 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_orbit.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_orbit.java @@ -11,7 +11,8 @@ import org.bukkit.entity.Player; import org.bukkit.util.Vector; @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH) -@CommandParameters(description = "POW!!! Right in the kisser! One of these days Alice, straight to the Moon!", usage = "/ [power]") +@CommandParameters(description = "POW!!! Right in the kisser! One of these days Alice, straight to the Moon!", + usage = "/ [< | stop>]") public class Command_orbit extends TFM_Command { @Override @@ -36,7 +37,7 @@ public class Command_orbit extends TFM_Command if (args.length >= 2) { - if (TFM_Util.isStopCommand(args[1])) + if (args[1].equals("stop")) { playerMsg("Stopped orbiting " + player.getName()); playerdata.stopOrbiting(); @@ -58,7 +59,7 @@ public class Command_orbit extends TFM_Command playerdata.startOrbiting(strength); player.setVelocity(new Vector(0, strength, 0)); - TFM_Util.adminAction(sender.getName(), "Orbiting " + player.getName() + ".", false); + TFM_Util.adminAction(sender.getName(), "Orbiting " + player.getName(), false); return true; } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_protectarea.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_protectarea.java index c7f02927..9dac70fb 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_protectarea.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_protectarea.java @@ -44,7 +44,7 @@ public class Command_protectarea extends TFM_Command } else if (args.length == 2) { - if (TFM_Util.isRemoveCommand(args[0])) + if ("remove".equals(args[0])) { TFM_ProtectedArea.removeProtectedArea(args[1]); diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_saconfig.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_saconfig.java index fcb4e0d4..6566ae9d 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_saconfig.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_saconfig.java @@ -170,7 +170,7 @@ public class Command_saconfig extends TFM_Command return true; } - if (TFM_Util.isRemoveCommand(args[0])) + if ("remove".equals(args[0])) { if (!TFM_AdminList.isSeniorAdmin(sender)) { diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tag.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tag.java index b26a8dda..dbadd36b 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tag.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tag.java @@ -56,7 +56,7 @@ public class Command_tag extends TFM_Command return true; } - if (TFM_Util.isStopCommand(args[0])) + if ("remove".equals(args[0])) { TFM_PlayerData.getPlayerData(sender_p).setTag(null); playerMsg("Your tag has been removed."); diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_toggle.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_toggle.java index 17ae85b6..49e8300c 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_toggle.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_toggle.java @@ -4,6 +4,7 @@ import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry; import me.StevenLawson.TotalFreedomMod.TFM_GameRuleHandler; import me.StevenLawson.TotalFreedomMod.TFM_GameRuleHandler.TFM_GameRule; import me.StevenLawson.TotalFreedomMod.TFM_Util; +import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -27,6 +28,7 @@ public class Command_toggle extends TFM_Command playerMsg("- lavadmg"); playerMsg("- firespread"); playerMsg("- prelog"); + playerMsg("- lockdown"); playerMsg("- petprotect"); playerMsg("- droptoggle"); playerMsg("- nonuke"); @@ -78,6 +80,13 @@ public class Command_toggle extends TFM_Command return true; } + if (args[0].equals("lockdown")) + { + TFM_Util.adminAction(sender.getName(), (TotalFreedomMod.lockdownEnabled ? "De-a" : "A") + "ctivating server lockdown", true); + TotalFreedomMod.lockdownEnabled = !TotalFreedomMod.lockdownEnabled; + return true; + } + if (args[0].equals("petprotect")) { toggle("Tamed pet protection is", TFM_ConfigEntry.PET_PROTECT_ENABLED); diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tossmob.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tossmob.java index d66b3f34..a3ca5d27 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tossmob.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tossmob.java @@ -13,7 +13,8 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; @CommandPermissions(level = AdminLevel.OP, source = SourceType.ONLY_IN_GAME) -@CommandParameters(description = "Throw a mob in the direction you are facing when you left click with a stick.", usage = "/ ") +@CommandParameters(description = "Throw a mob in the direction you are facing when you left click with a stick.", + usage = "/ ") public class Command_tossmob extends TFM_Command { @Override @@ -30,7 +31,7 @@ public class Command_tossmob extends TFM_Command EntityType creature = EntityType.PIG; if (args.length >= 1) { - if (TFM_Util.isStopCommand(args[0])) + if ("off".equals(args[0])) { playerData.disableMobThrower(); playerMsg("MobThrower is disabled.", ChatColor.GREEN); diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_trail.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_trail.java index 2c10cfd1..5675ec36 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_trail.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_trail.java @@ -28,7 +28,7 @@ public class Command_trail extends TFM_Command @Override public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { - if (args.length > 0 && TFM_Util.isStopCommand(args[0])) + if (args.length > 0 && "off".equals(args[0])) { trailPlayers.remove(sender_p); diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_whitelist.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_whitelist.java index b98b2220..50c25276 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_whitelist.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_whitelist.java @@ -101,7 +101,7 @@ public class Command_whitelist extends TFM_Command } // remove - if (TFM_Util.isRemoveCommand(args[0])) + if ("remove".equals(args[0])) { if (args.length < 2) { diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java b/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java index f9ae28f8..a3014f14 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java @@ -45,8 +45,6 @@ public class TFM_Util { private static final Map ejectTracker = new HashMap(); public static final Map mobtypes = new HashMap(); - public static final List STOP_COMMANDS = Arrays.asList("stop", "off", "end", "halt", "die"); - public static final List REMOVE_COMMANDS = Arrays.asList("del", "delete", "rem", "remove"); public static final List DEVELOPERS = Arrays.asList("Madgeek1450", "DarthSalamon", "AcidicCyanide", "wild1145", "WickedGamingUK", "xXWilee999Xx"); private static final Random RANDOM = new Random(); public static String DATE_STORAGE_FORMAT = "EEE, d MMM yyyy HH:mm:ss Z"; @@ -430,16 +428,6 @@ public class TFM_Util return new File(plugin.getDataFolder(), name); } - public static boolean isStopCommand(String command) - { - return STOP_COMMANDS.contains(command.toLowerCase()); - } - - public static boolean isRemoveCommand(String command) - { - return REMOVE_COMMANDS.contains(command.toLowerCase()); - } - public static void autoEject(Player player, String kickMessage) { EjectMethod method = EjectMethod.STRIKE_ONE; From 9bc0859fdf6c219fbec50a517e0fcfe1048868c0 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 5 May 2014 16:03:15 +0200 Subject: [PATCH 2/3] Added /tagnyan. Resolves #170 --- buildnumber.properties | 4 +- .../Commands/Command_tagnyan.java | 37 +++++++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 src/me/StevenLawson/TotalFreedomMod/Commands/Command_tagnyan.java diff --git a/buildnumber.properties b/buildnumber.properties index 355dd791..a31fd845 100644 --- a/buildnumber.properties +++ b/buildnumber.properties @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Mon May 05 15:29:34 CEST 2014 -build.number=821 +#Mon May 05 16:00:01 CEST 2014 +build.number=822 diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tagnyan.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tagnyan.java new file mode 100644 index 00000000..87e8c72c --- /dev/null +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tagnyan.java @@ -0,0 +1,37 @@ +package me.StevenLawson.TotalFreedomMod.Commands; + +import me.StevenLawson.TotalFreedomMod.TFM_PlayerData; +import me.StevenLawson.TotalFreedomMod.TFM_Util; +import net.minecraft.util.org.apache.commons.lang3.StringUtils; +import org.bukkit.ChatColor; +import org.bukkit.command.Command; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + +@CommandPermissions(level = AdminLevel.OP, source = SourceType.ONLY_IN_GAME) +@CommandParameters(description = "Gives you a tag with random colors", usage = "/ ", aliases = "tn") +public class Command_tagnyan extends TFM_Command +{ + @Override + public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) + { + if (args.length < 1) + { + return false; + } + + final StringBuilder tag = new StringBuilder(); + + for (char c : ChatColor.stripColor(TFM_Util.colorize(StringUtils.join(args, " "))).toCharArray()) + { + tag.append(TFM_Util.randomChatColor()).append(c); + } + + final TFM_PlayerData data = TFM_PlayerData.getPlayerData(sender_p); + data.setTag(tag.toString()); + + playerMsg("Set tag to " + tag); + + return true; + } +} From 8a4fa946fd80d7a48e059f672e2db2a328a3736c Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 5 May 2014 16:10:14 +0200 Subject: [PATCH 3/3] Make /doom ban all IPs Before, /doom would only ban the current IP --- buildnumber.properties | 4 ++-- .../TotalFreedomMod/Commands/Command_cage.java | 2 +- .../TotalFreedomMod/Commands/Command_denick.java | 5 ++--- .../TotalFreedomMod/Commands/Command_doom.java | 8 ++++++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/buildnumber.properties b/buildnumber.properties index a31fd845..7943cfbe 100644 --- a/buildnumber.properties +++ b/buildnumber.properties @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Mon May 05 16:00:01 CEST 2014 -build.number=822 +#Mon May 05 16:09:04 CEST 2014 +build.number=823 diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cage.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cage.java index 07410b17..dd97743d 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cage.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cage.java @@ -35,7 +35,7 @@ public class Command_cage extends TFM_Command } else if ("purge".equals(args[0])) { - TFM_Util.adminAction(sender.getName(), "Uncaging all players.", true); + TFM_Util.adminAction(sender.getName(), "Uncaging all players", true); for (Player player : server.getOnlinePlayers()) { diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_denick.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_denick.java index 022ec4b0..88149a3d 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_denick.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_denick.java @@ -13,10 +13,9 @@ public class Command_denick extends TFM_Command @Override public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { - TFM_Util.adminAction(sender.getName(), "Removing all nicknames.", false); + TFM_Util.adminAction(sender.getName(), "Removing all nicknames", false); - Player[] onlinePlayers = server.getOnlinePlayers(); - for (Player player : onlinePlayers) + for (Player player : server.getOnlinePlayers()) { TFM_EssentialsBridge.getInstance().setNickname(player.getName(), null); } diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_doom.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_doom.java index be55d031..2b9946ad 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_doom.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_doom.java @@ -3,6 +3,7 @@ package me.StevenLawson.TotalFreedomMod.Commands; import me.StevenLawson.TotalFreedomMod.TFM_AdminList; import me.StevenLawson.TotalFreedomMod.TFM_Ban; import me.StevenLawson.TotalFreedomMod.TFM_BanManager; +import me.StevenLawson.TotalFreedomMod.TFM_PlayerList; import me.StevenLawson.TotalFreedomMod.TFM_Util; import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; import org.bukkit.ChatColor; @@ -51,8 +52,11 @@ public class Command_doom extends TFM_Command // deop player.setOp(false); - // ban IP - TFM_BanManager.getInstance().addIpBan(new TFM_Ban(ip, player.getName())); + // ban IPs + for (String playerIp : TFM_PlayerList.getInstance().getEntry(player).getIps()) + { + TFM_BanManager.getInstance().addIpBan(new TFM_Ban(playerIp, player.getName())); + } // ban name TFM_BanManager.getInstance().addUuidBan(new TFM_Ban(player.getUniqueId(), player.getName()));