From 2bebb0bd61df65a30de210d57d4e46e1334a65d0 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Wed, 13 Jun 2012 00:49:36 +0100 Subject: [PATCH 1/3] 3 char min length on /pay and /msg --- .../src/com/earth2me/essentials/commands/Commandmsg.java | 4 ++-- .../src/com/earth2me/essentials/commands/Commandpay.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmsg.java b/Essentials/src/com/earth2me/essentials/commands/Commandmsg.java index 2e1011e3b..2b7be976e 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandmsg.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandmsg.java @@ -21,11 +21,11 @@ public class Commandmsg extends EssentialsCommand @Override public void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception { - if (args.length < 2 || args[0].trim().isEmpty() || args[1].trim().isEmpty()) + if (args.length < 2 || args[0].trim().length() < 3 || args[1].trim().isEmpty()) { throw new NotEnoughArgumentsException(); } - + String message = getFinalArg(args, 1); if (sender instanceof Player) { diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandpay.java b/Essentials/src/com/earth2me/essentials/commands/Commandpay.java index ed9a6bc29..08d024636 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandpay.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandpay.java @@ -22,7 +22,7 @@ public class Commandpay extends EssentialsCommand throw new NotEnoughArgumentsException(); } - if (args[0] == "") + if (args[0].trim().length() < 3) { throw new NotEnoughArgumentsException("You need to specify a player to pay."); } From 0436962ee74f8769bbd42910cc0f4b07a03e6b91 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Wed, 13 Jun 2012 02:51:47 +0100 Subject: [PATCH 2/3] Invert teleport timer. --- Essentials/src/com/earth2me/essentials/Teleport.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/Teleport.java b/Essentials/src/com/earth2me/essentials/Teleport.java index a920544cb..198ffab15 100644 --- a/Essentials/src/com/earth2me/essentials/Teleport.java +++ b/Essentials/src/com/earth2me/essentials/Teleport.java @@ -169,8 +169,8 @@ public class Teleport implements Runnable, ITeleport else if (lastTime > earliestLong && !user.isAuthorized("essentials.teleport.cooldown.bypass")) { time.setTimeInMillis(lastTime); - time.add(Calendar.SECOND, (int)delay); - time.add(Calendar.MILLISECOND, (int)((delay * 1000.0) % 1000.0)); + time.add(Calendar.SECOND, (-1) * (int)delay); + time.add(Calendar.MILLISECOND, (-1) * (int)((delay * 1000.0) % 1000.0)); throw new Exception(_("timeBeforeTeleport", Util.formatDateDiff(time.getTimeInMillis()))); } } From 10d902e730581e579c4da5d4f2d0e2c2a5da07c4 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Wed, 13 Jun 2012 03:06:42 +0100 Subject: [PATCH 3/3] Revert "Invert teleport timer." This reverts commit 0436962ee74f8769bbd42910cc0f4b07a03e6b91. --- Essentials/src/com/earth2me/essentials/Teleport.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/Teleport.java b/Essentials/src/com/earth2me/essentials/Teleport.java index 198ffab15..a920544cb 100644 --- a/Essentials/src/com/earth2me/essentials/Teleport.java +++ b/Essentials/src/com/earth2me/essentials/Teleport.java @@ -169,8 +169,8 @@ public class Teleport implements Runnable, ITeleport else if (lastTime > earliestLong && !user.isAuthorized("essentials.teleport.cooldown.bypass")) { time.setTimeInMillis(lastTime); - time.add(Calendar.SECOND, (-1) * (int)delay); - time.add(Calendar.MILLISECOND, (-1) * (int)((delay * 1000.0) % 1000.0)); + time.add(Calendar.SECOND, (int)delay); + time.add(Calendar.MILLISECOND, (int)((delay * 1000.0) % 1000.0)); throw new Exception(_("timeBeforeTeleport", Util.formatDateDiff(time.getTimeInMillis()))); } }