TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-08-05 12:02:53 +00:00
Code Issues Projects Releases Wiki Activity

Switch AFK check to use UUID.

Browse source
This commit is contained in:
KHobbits 2014-04-27 01:10:44 +01:00
parent b40aa43872
commit 0557aa58b0
2 changed files with 25 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Essentials/src/com/earth2me/essentials/EssentialsTimer.java
View file

@ -4,6 +4,7 @@ import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.Set; import java.util.Set;
import java.util.UUID;
import java.util.logging.Level; import java.util.logging.Level;
import net.ess3.api.IEssentials; import net.ess3.api.IEssentials;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -12,7 +13,7 @@ import org.bukkit.entity.Player;
public class EssentialsTimer implements Runnable public class EssentialsTimer implements Runnable
{ {
private final transient IEssentials ess; private final transient IEssentials ess;
private final transient Set<String> onlineUsers = new HashSet<String>(); private final transient Set<UUID> onlineUsers = new HashSet<UUID>();
private transient long lastPoll = System.nanoTime(); private transient long lastPoll = System.nanoTime();
private final LinkedList<Double> history = new LinkedList<Double>(); private final LinkedList<Double> history = new LinkedList<Double>();
private int skip1 = 0; private int skip1 = 0;
@ -66,7 +67,7 @@ public class EssentialsTimer implements Runnable
try try
{ {
final User user = ess.getUser(player); final User user = ess.getUser(player);
onlineUsers.add(user.getName()); onlineUsers.add(user.getBase().getUniqueId());
user.setLastOnlineActivity(currentTime); user.setLastOnlineActivity(currentTime);
user.checkActivity(); user.checkActivity();
} }
@ -77,7 +78,7 @@ public class EssentialsTimer implements Runnable
} }
count = 0; count = 0;
final Iterator<String> iterator = onlineUsers.iterator(); final Iterator<UUID> iterator = onlineUsers.iterator();
while (iterator.hasNext()) while (iterator.hasNext())
{ {
count++; count++;

22
Essentials/src/com/earth2me/essentials/commands/EssentialsCommand.java
View file

@ -5,6 +5,7 @@ import static com.earth2me.essentials.I18n.tl;
import com.earth2me.essentials.utils.FormatUtil; import com.earth2me.essentials.utils.FormatUtil;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.UUID;
import java.util.logging.Logger; import java.util.logging.Logger;
import net.ess3.api.IEssentials; import net.ess3.api.IEssentials;
import org.bukkit.Server; import org.bukkit.Server;
@ -86,8 +87,27 @@ public abstract class EssentialsCommand implements IEssentialsCommand
private User getPlayer(final Server server, final User sourceUser, final String searchTerm, boolean getHidden, final boolean getOffline) throws PlayerNotFoundException private User getPlayer(final Server server, final User sourceUser, final String searchTerm, boolean getHidden, final boolean getOffline) throws PlayerNotFoundException
{ {
final User user;
Player exPlayer;
try
{
exPlayer = server.getPlayer(UUID.fromString(searchTerm));
}
catch (IllegalArgumentException ex)
{
exPlayer = server.getPlayer(searchTerm);
}
if (exPlayer != null)
{
user = ess.getUser(exPlayer);
}
else
{
user = ess.getUser(searchTerm);
}
final User user = ess.getUser(searchTerm);
if (user != null) if (user != null)
{ {
if (!getOffline && !user.getBase().isOnline()) if (!getOffline && !user.getBase().isOnline())