summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsnowleo <schneeleo@gmail.com>2013-05-03 01:15:02 +0200
committersnowleo <schneeleo@gmail.com>2013-05-03 01:15:02 +0200
commitc62f762724991f5cd55a4698b9d885d4bb8e42be (patch)
treedbe56be9e4b000d68be8fba56b639ef544eda336
parent4bdeb1324d3fd5d4a81a7c0dba580c80110b7c25 (diff)
downloadEssentials-c62f762724991f5cd55a4698b9d885d4bb8e42be.tar
Essentials-c62f762724991f5cd55a4698b9d885d4bb8e42be.tar.gz
Essentials-c62f762724991f5cd55a4698b9d885d4bb8e42be.tar.lz
Essentials-c62f762724991f5cd55a4698b9d885d4bb8e42be.tar.xz
Essentials-c62f762724991f5cd55a4698b9d885d4bb8e42be.zip
Do not keep hard references to User objects
-rw-r--r--Essentials/src/com/earth2me/essentials/EssentialsTimer.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsTimer.java b/Essentials/src/com/earth2me/essentials/EssentialsTimer.java
index 38c42e918..d53336bb2 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsTimer.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsTimer.java
@@ -11,7 +11,7 @@ import org.bukkit.entity.Player;
public class EssentialsTimer implements Runnable
{
private final transient IEssentials ess;
- private final transient Set<User> onlineUsers = new HashSet<User>();
+ private final transient Set<String> onlineUsers = new HashSet<String>();
private transient long lastPoll = System.nanoTime();
private final LinkedList<Double> history = new LinkedList<Double>();
private int skip1 = 0;
@@ -64,7 +64,7 @@ public class EssentialsTimer implements Runnable
try
{
final User user = ess.getUser(player);
- onlineUsers.add(user);
+ onlineUsers.add(user.getName());
user.setLastOnlineActivity(currentTime);
user.checkActivity();
}
@@ -75,7 +75,7 @@ public class EssentialsTimer implements Runnable
}
count = 0;
- final Iterator<User> iterator = onlineUsers.iterator();
+ final Iterator<String> iterator = onlineUsers.iterator();
while (iterator.hasNext())
{
count++;
@@ -92,7 +92,7 @@ public class EssentialsTimer implements Runnable
break;
}
}
- final User user = iterator.next();
+ final User user = ess.getUser(iterator.next());
if (user.getLastOnlineActivity() < currentTime && user.getLastOnlineActivity() > user.getLastLogout())
{
user.setLastLogout(user.getLastOnlineActivity());