Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-11-03 01:19:58 +01:00
Code Issues Projects Releases Wiki Activity

Remove 'set' and 'add' from /time command args, to allow use of original syntax.

Browse Source
This commit is contained in:
KHobbits 2012-04-07 04:22:17 +01:00
parent fe95cfe03b
commit 0eefb7f5a1
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Essentials/src/com/earth2me/essentials/commands/Commandtime.java
View File

@ -3,6 +3,7 @@ package com.earth2me.essentials.commands;
import com.earth2me.essentials.DescParseTickFormat; import com.earth2me.essentials.DescParseTickFormat;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import com.earth2me.essentials.Util;
import java.util.*; import java.util.*;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.World; import org.bukkit.World;
@ -19,16 +20,22 @@ public class Commandtime extends EssentialsCommand
@Override @Override
public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
{ {
final List<String> argList = new ArrayList<String>(Arrays.asList(args));
if ((argList.remove("set") || argList.remove("add")) && Util.isInt(argList.get(0))) {
ess.getLogger().info("debug edited 0" + argList.get(0).toString());
}
final String[] validArgs = argList.toArray(new String[0]);
// Which World(s) are we interested in? // Which World(s) are we interested in?
String worldSelector = null; String worldSelector = null;
if (args.length == 2) if (validArgs.length == 2)
{ {
worldSelector = args[1]; worldSelector = validArgs[1];
} }
final Set<World> worlds = getWorlds(server, sender, worldSelector); final Set<World> worlds = getWorlds(server, sender, worldSelector);
// If no arguments we are reading the time // If no arguments we are reading the time
if (args.length == 0) if (validArgs.length == 0)
{ {
getWorldsTime(sender, worlds); getWorldsTime(sender, worlds);
return; return;
@ -45,7 +52,7 @@ public class Commandtime extends EssentialsCommand
long ticks; long ticks;
try try
{ {
ticks = DescParseTickFormat.parse(args[0]); ticks = DescParseTickFormat.parse(validArgs[0]);
} }
catch (NumberFormatException e) catch (NumberFormatException e)
{ {