summaryrefslogtreecommitdiffstats
path: root/Essentials/src/com/earth2me/essentials/commands
diff options
context:
space:
mode:
Diffstat (limited to 'Essentials/src/com/earth2me/essentials/commands')
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandnear.java5
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandptime.java4
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandpweather.java4
3 files changed, 6 insertions, 7 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)
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandptime.java b/Essentials/src/com/earth2me/essentials/commands/Commandptime.java
index 6bd748bff..edb16d5d7 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandptime.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandptime.java
@@ -220,9 +220,9 @@ public class Commandptime extends EssentialsCommand
// If that fails, Is the argument something like "*" or "all"?
else if (selector.equalsIgnoreCase("*") || selector.equalsIgnoreCase("all"))
{
- for (Player player : server.getOnlinePlayers())
+ for (User u : ess.getOnlineUsers())
{
- users.add(ess.getUser(player));
+ users.add(u);
}
}
// We failed to understand the world target...
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandpweather.java b/Essentials/src/com/earth2me/essentials/commands/Commandpweather.java
index 9aec1ff6b..69e0295dc 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandpweather.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandpweather.java
@@ -170,9 +170,9 @@ public class Commandpweather extends EssentialsCommand
// If that fails, Is the argument something like "*" or "all"?
else if (selector.equalsIgnoreCase("*") || selector.equalsIgnoreCase("all"))
{
- for (Player player : server.getOnlinePlayers())
+ for (User u : ess.getOnlineUsers())
{
- users.add(ess.getUser(player));
+ users.add(u);
}
}
// We failed to understand the world target...