summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2013-07-15 23:15:35 +0100
committerKHobbits <rob@khobbits.co.uk>2013-07-15 23:15:35 +0100
commitfe8d1dd4f318eb9dfc8a507719ef10adac566596 (patch)
tree9439f87770059c37d0566f107c7618586d901045
parentf637b8c8be467aa00771448dc2932694a0343ccb (diff)
downloadEssentials-fe8d1dd4f318eb9dfc8a507719ef10adac566596.tar
Essentials-fe8d1dd4f318eb9dfc8a507719ef10adac566596.tar.gz
Essentials-fe8d1dd4f318eb9dfc8a507719ef10adac566596.tar.lz
Essentials-fe8d1dd4f318eb9dfc8a507719ef10adac566596.tar.xz
Essentials-fe8d1dd4f318eb9dfc8a507719ef10adac566596.zip
Fix radius logic
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandnear.java15
1 files changed, 9 insertions, 6 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandnear.java b/Essentials/src/com/earth2me/essentials/commands/Commandnear.java
index b099c331b..1f1f812b8 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandnear.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandnear.java
@@ -19,12 +19,15 @@ public class Commandnear extends EssentialsCommand
@Override
protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
{
- long chatRadius = ess.getSettings().getChatRadius();
- long radius = chatRadius;
- if (radius == 0)
+ long maxRadius = ess.getSettings().getChatRadius();
+
+ if (maxRadius == 0)
{
- radius = 200;
+ maxRadius = 200;
}
+
+ long radius = maxRadius;
+
User otherUser = null;
if (args.length > 0)
@@ -55,9 +58,9 @@ public class Commandnear extends EssentialsCommand
}
}
- if (radius > chatRadius && !user.isAuthorized("essentials.near.exemptradius"))
+ if (radius > maxRadius && !user.isAuthorized("essentials.near.maxexempt"))
{
- user.sendMessage(_("radiusTooBig", chatRadius));
+ user.sendMessage(_("radiusTooBig", maxRadius));
}
if (otherUser == null || user.isAuthorized("essentials.near.others"))