Merge branch 'master' of ../TotalFreedomMod_org

This commit is contained in:
Steven Lawson 2013-07-12 20:48:19 -04:00
commit 123884329c
4 changed files with 14 additions and 3 deletions

View File

@ -1,5 +1,6 @@
#Thu, 11 Jul 2013 20:20:19 -0400
#Wed, 10 Jul 2013 23:58:09 +0200
program.VERSION=2.21
program.BUILDNUM=301
program.BUILDDATE=07/11/2013 08\:20 PM
program.BUILDDATE=07/10/2013 11\:58 PM

View File

@ -1,3 +1,3 @@
#Build Number for ANT. Do not edit!
#Thu Jul 11 20:20:19 EDT 2013
#Wed Jul 10 23:58:09 CEST 2013
build.number=302

View File

@ -14,6 +14,11 @@ public class Command_adminmode 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 (args[0].equalsIgnoreCase("off"))
{
TotalFreedomMod.adminOnlyMode = false;

View File

@ -153,6 +153,11 @@ public class TotalFreedomMod extends JavaPlugin
commandLabel,
StringUtils.join(args, " ")), true);
}
if ("".equals(commandLabel))
{
return false;
}
TFM_Command dispatcher;
try