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

Switch /near priority to check for int first.

Browse Source 
Test #1269
This commit is contained in:
KHobbits 2012-01-29 03:09:59 +00:00
parent 735f9ce212
commit 9ee78bdaec
1 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Essentials/src/com/earth2me/essentials/commands/Commandnear.java
View File

@ -26,29 +26,29 @@ public class Commandnear extends EssentialsCommand
{ {
try try
{ {
otherUser = getPlayer(server, args, 0); radius = Long.parseLong(args[0]);
} }
catch (Exception ex) catch (NumberFormatException e)
{ {
try try
{ {
radius = Long.parseLong(args[0]); otherUser = getPlayer(server, args, 0);
}
catch (Exception ex)
{
}
}
if (args.length > 1 && otherUser != null)
{
try
{
radius = Long.parseLong(args[1]);
} }
catch (NumberFormatException e) catch (NumberFormatException e)
{ {
} }
} }
} }
if (args.length > 1 && otherUser != null)
{
try
{
radius = Long.parseLong(args[1]);
}
catch (NumberFormatException e)
{
}
}
if (otherUser == null || user.isAuthorized("essentials.near.others")) if (otherUser == null || user.isAuthorized("essentials.near.others"))
{ {
user.sendMessage(_("nearbyPlayers", getLocal(server, otherUser == null ? user : otherUser, radius))); user.sendMessage(_("nearbyPlayers", getLocal(server, otherUser == null ? user : otherUser, radius)));
@ -62,16 +62,11 @@ public class Commandnear extends EssentialsCommand
@Override @Override
protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
{ {
if (args.length == 0)
User otherUser = null;
if (args.length > 0)
{
otherUser = getPlayer(server, args, 0);
}
else
{ {
throw new NotEnoughArgumentsException(); throw new NotEnoughArgumentsException();
} }
final User otherUser = getPlayer(server, args, 0);
long radius = 200; long radius = 200;
if (args.length > 1) if (args.length > 1)
{ {