summaryrefslogtreecommitdiffstats
path: root/Essentials/src/com/earth2me/essentials/commands/Commandnear.java
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2014-09-03 00:21:42 +0100
committerKHobbits <rob@khobbits.co.uk>2014-09-03 00:21:42 +0100
commit767596c4e5627bc386ae03e127f5050dcb22b89b (patch)
treeb8f54a6cfad093aeb263580b9858175f6b954121 /Essentials/src/com/earth2me/essentials/commands/Commandnear.java
parent98db85cb34ef292951089562d450e453d96c6316 (diff)
parentf36d629cfa55436852d62c6ac4eef24196602702 (diff)
downloadEssentials-767596c4e5627bc386ae03e127f5050dcb22b89b.tar
Essentials-767596c4e5627bc386ae03e127f5050dcb22b89b.tar.gz
Essentials-767596c4e5627bc386ae03e127f5050dcb22b89b.tar.lz
Essentials-767596c4e5627bc386ae03e127f5050dcb22b89b.tar.xz
Essentials-767596c4e5627bc386ae03e127f5050dcb22b89b.zip
Merge branch '2.x' of github.com:essentials/Essentials into 2.x
Diffstat (limited to 'Essentials/src/com/earth2me/essentials/commands/Commandnear.java')
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandnear.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandnear.java b/Essentials/src/com/earth2me/essentials/commands/Commandnear.java
index 29d30b3e7..a31c220ca 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandnear.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandnear.java
@@ -103,10 +103,9 @@ public class Commandnear extends EssentialsCommand
final long radiusSquared = radius * radius;
boolean showHidden = user.canInteractVanished();
- for (Player onlinePlayer : server.getOnlinePlayers())
+ for (User player: ess.getOnlineUsers())
{
- final User player = ess.getUser(onlinePlayer);
- if (!player.equals(user) && (!player.isHidden(user.getBase()) || showHidden || user.getBase().canSee(onlinePlayer)))
+ if (!player.equals(user) && (!player.isHidden(user.getBase()) || showHidden || user.getBase().canSee(player.getBase())))
{
final Location playerLoc = player.getLocation();
if (playerLoc.getWorld() != world)