Merged from master

This commit is contained in:
unknown 2014-04-15 16:43:38 +02:00
commit 3371f54c06
3 changed files with 6 additions and 3 deletions

View file

@ -1,3 +1,3 @@
#Build Number for ANT. Do not edit!
#Tue Apr 15 16:28:36 CEST 2014
build.number=762
#Tue Apr 15 16:43:28 CEST 2014
build.number=763

View file

@ -22,6 +22,7 @@ public class Command_invis extends TFM_Command
{
if (args[0].equalsIgnoreCase("smite"))
{
TFM_Util.adminAction(sender.getName(), "Smiting all invisible players", true);
smite = true;
}
else
@ -40,7 +41,6 @@ public class Command_invis extends TFM_Command
players.add(player.getName());
if (smite && !TFM_AdminList.isSuperAdmin(player))
{
TFM_Util.adminAction(sender.getName(), "Smiting all invisible players", true);
player.setHealth(0.0);
smites++;
}

View file

@ -4,6 +4,7 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import me.StevenLawson.TotalFreedomMod.TFM_Log;
import me.StevenLawson.TotalFreedomMod.TFM_Util;
import me.StevenLawson.TotalFreedomMod.TFM_ServerInterface;
import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
import me.StevenLawson.TotalFreedomMod.TFM_BanManager;
@ -28,6 +29,8 @@ public class Command_tfipbanlist extends TFM_Command
try
{
TFM_BanManager.getInstance().purgeIpBans();
TFM_Util.adminAction(sender.getName(), "Purging the IP ban list", true);
sender.sendMessage(ChatColor.GRAY + "IP ban list has been purged.");
}
catch (Exception ex)