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()));