summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIaccidentally <coryhuckaby@gmail.com>2012-06-12 22:33:12 -0400
committerIaccidentally <coryhuckaby@gmail.com>2012-06-12 22:33:12 -0400
commit31ea15caac1a78494c3fcf8824bb7b449daaecf8 (patch)
tree24d7c16f0d020b0c2d59ca524ef3a106a0facf02
parent646d9dec3a01d425576838c7e7b2f1d89af56948 (diff)
parent3be9803130e65ca710403ea2eac19fb828ffdc0c (diff)
downloadEssentials-31ea15caac1a78494c3fcf8824bb7b449daaecf8.tar
Essentials-31ea15caac1a78494c3fcf8824bb7b449daaecf8.tar.gz
Essentials-31ea15caac1a78494c3fcf8824bb7b449daaecf8.tar.lz
Essentials-31ea15caac1a78494c3fcf8824bb7b449daaecf8.tar.xz
Essentials-31ea15caac1a78494c3fcf8824bb7b449daaecf8.zip
Merge branch 'master' of https://github.com/essentials/Essentials
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandmsg.java4
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandpay.java2
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.");
}