Merge branch 'master' into adminworld

This commit is contained in:
Steven Lawson 2013-08-15 17:45:41 -04:00
commit 25fbb0c05a

View File

@ -30,10 +30,9 @@ public class Command_tban extends TFM_Command
return true; return true;
} }
TFM_Util.adminAction(sender.getName(), "Tempbanning: " + player.getName() " for 5 minutes.", true); TFM_Util.adminAction(sender.getName(), "Tempbanning: " + player.getName() + " for 5 minutes.", true);
TFM_ServerInterface.banUsername(player.getName(), ChatColor.RED + "You have been temporarily banned for 5 minutes", TFM_ServerInterface.banUsername(player.getName(), ChatColor.RED + "You have been temporarily banned for 5 minutes.", sender.getName(), TFM_Util.parseDateOffset("5m"));
sender.getName(), TFM_Util.parseDateOffset("5m")); player.kickPlayer(ChatColor.RED + "You have been temporarily banned for five minutes. Please read totalfreedom.me for more info.");
player.kickPlayer(ChatColor.RED + "\nYou have been temporarily banned for five minutes. Please read totalfreedom.me for more info.");
return true; return true;
} }