summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsnowleo <schneeleo@gmail.com>2011-08-08 18:21:38 +0200
committersnowleo <schneeleo@gmail.com>2011-08-08 18:21:38 +0200
commit858e2a8b8986394029dd4f7997c667df00ebdcbe (patch)
tree4db226e4b64bdf9cf0e3141c93effc57d96d9f01
parent33d37a2f9689ee194434a177fdd7ac6e0197ab78 (diff)
downloadEssentials-858e2a8b8986394029dd4f7997c667df00ebdcbe.tar
Essentials-858e2a8b8986394029dd4f7997c667df00ebdcbe.tar.gz
Essentials-858e2a8b8986394029dd4f7997c667df00ebdcbe.tar.lz
Essentials-858e2a8b8986394029dd4f7997c667df00ebdcbe.tar.xz
Essentials-858e2a8b8986394029dd4f7997c667df00ebdcbe.zip
Reverting some changes to /time command
-rwxr-xr-xEssentials/src/com/earth2me/essentials/commands/Commandptime.java6
-rwxr-xr-xEssentials/src/com/earth2me/essentials/commands/Commandtime.java6
2 files changed, 2 insertions, 10 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandptime.java b/Essentials/src/com/earth2me/essentials/commands/Commandptime.java
index b4fa23c05..f94a7cfff 100755
--- a/Essentials/src/com/earth2me/essentials/commands/Commandptime.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandptime.java
@@ -37,10 +37,6 @@ public class Commandptime extends EssentialsCommand
{
userSelector = args[1];
}
- if (args.length == 3)
- {
- userSelector = args[2];
- }
Set<User> users = getUsers(server, sender, userSelector);
// If no arguments we are reading the time
@@ -59,7 +55,7 @@ public class Commandptime extends EssentialsCommand
Long ticks;
// Parse the target time int ticks from args[0]
- String timeParam = args.length == 2 ? args[0] : args[0] + args[1];
+ String timeParam = args[0];
if (DescParseTickFormat.meansReset(timeParam))
{
ticks = null;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtime.java b/Essentials/src/com/earth2me/essentials/commands/Commandtime.java
index d7a339b9e..23f9138a9 100755
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtime.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandtime.java
@@ -32,10 +32,6 @@ public class Commandtime extends EssentialsCommand
{
worldSelector = args[1];
}
- if (args.length == 3)
- {
- worldSelector = args[2];
- }
Set<World> worlds = getWorlds(server, sender, worldSelector);
// If no arguments we are reading the time
@@ -56,7 +52,7 @@ public class Commandtime extends EssentialsCommand
long ticks;
try
{
- ticks = DescParseTickFormat.parse(args.length == 2 ? args[0] : args[0] + args[1]);
+ ticks = DescParseTickFormat.parse(args[0]);
}
catch (NumberFormatException e)
{