summaryrefslogtreecommitdiffstats
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
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
-rw-r--r--Essentials/src/com/earth2me/essentials/Essentials.java8
-rw-r--r--Essentials/src/com/earth2me/essentials/User.java2
-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
-rw-r--r--Essentials/src/com/earth2me/essentials/textreader/KeywordReplacer.java2
6 files changed, 11 insertions, 14 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java
index fc100ee3d..e8d0a5d3a 100644
--- a/Essentials/src/com/earth2me/essentials/Essentials.java
+++ b/Essentials/src/com/earth2me/essentials/Essentials.java
@@ -325,9 +325,8 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
@Override
public void onDisable()
{
- for (Player p : getServer().getOnlinePlayers())
+ for (User user : getOnlineUsers())
{
- User user = getUser(p);
if (user.isVanished())
{
user.setVanished(false);
@@ -562,9 +561,8 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
public void cleanupOpenInventories()
{
- for (Player player : getServer().getOnlinePlayers())
+ for (User user : getOnlineUsers())
{
- User user = getUser(player);
if (user.isRecipeSee())
{
user.getBase().getOpenInventory().getTopInventory().clear();
@@ -742,7 +740,7 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
event.getPlayer().sendMessage("Essentials failed to load, read the log file.");
}
}, this);
- for (Player player : getServer().getOnlinePlayers())
+ for (Player player : getOnlinePlayers())
{
player.sendMessage("Essentials failed to load, read the log file.");
}
diff --git a/Essentials/src/com/earth2me/essentials/User.java b/Essentials/src/com/earth2me/essentials/User.java
index a0dc39843..41a32e529 100644
--- a/Essentials/src/com/earth2me/essentials/User.java
+++ b/Essentials/src/com/earth2me/essentials/User.java
@@ -780,7 +780,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
}
else
{
- for (Player p : ess.getServer().getOnlinePlayers())
+ for (Player p : ess.getOnlinePlayers())
{
p.showPlayer(getBase());
}
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...
diff --git a/Essentials/src/com/earth2me/essentials/textreader/KeywordReplacer.java b/Essentials/src/com/earth2me/essentials/textreader/KeywordReplacer.java
index 3395a4b7f..c2c40b1dc 100644
--- a/Essentials/src/com/earth2me/essentials/textreader/KeywordReplacer.java
+++ b/Essentials/src/com/earth2me/essentials/textreader/KeywordReplacer.java
@@ -222,7 +222,7 @@ public class KeywordReplacer implements IText
//Now lets build the all user playerlist
final StringBuilder playerlistBuilder = new StringBuilder();
- for (Player p : ess.getServer().getOnlinePlayers())
+ for (Player p : ess.getOnlinePlayers())
{
if (ess.getUser(p).isHidden())
{