Use quicker ban lookup to reduce /seen lag. · essentials/Essentials@8890660 · GitHub
Skip to content

Commit 8890660

Browse files
khobbitskhobbits
committed
Use quicker ban lookup to reduce /seen lag.
1 parent 0cab5b9 commit 8890660

4 files changed

Lines changed: 45 additions & 8 deletions

File tree

‎Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java‎

Lines changed: 2 additions & 1 deletion

‎Essentials/src/com/earth2me/essentials/commands/Commandseen.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44
import static com.earth2me.essentials.I18n.tl;
55
import com.earth2me.essentials.User;
66
import com.earth2me.essentials.UserMap;
7+
import com.earth2me.essentials.craftbukkit.BanLookup;
78
import com.earth2me.essentials.utils.DateUtil;
89
import com.earth2me.essentials.utils.FormatUtil;
910
import com.earth2me.essentials.utils.StringUtil;
10-
import java.text.DateFormat;
1111
import java.util.ArrayList;
1212
import java.util.Date;
1313
import java.util.List;
1414
import org.bukkit.BanList;
15-
import org.bukkit.Bukkit;
1615
import java.util.UUID;
1716
import org.bukkit.BanEntry;
1817
import org.bukkit.Location;
@@ -64,9 +63,9 @@ else if (ess.getServer().getBanList(BanList.Type.IP).isBanned(args[0]))
6463
sender.sendMessage(tl("isIpBanned", args[0]));
6564
return;
6665
}
67-
else if (ess.getServer().getBanList(BanList.Type.NAME).isBanned(args[0]))
66+
else if (BanLookup.isBanned(ess, args[0]))
6867
{
69-
sender.sendMessage(tl("whoisBanned", showBan ? ess.getServer().getBanList(BanList.Type.NAME).getBanEntry(args[0]).getReason() : tl("true")));
68+
sender.sendMessage(tl("whoisBanned", showBan ? BanLookup.getBanEntry(ess, args[0]).getReason() : tl("true")));
7069
return;
7170
}
7271
else
@@ -145,9 +144,9 @@ private void seenOffline(final Server server, final CommandSource sender, User u
145144
sender.sendMessage(tl("seenAccounts", StringUtil.joinListSkip(", ", user.getName(), history)));
146145
}
147146

148-
if (user.getBase().isBanned())
147+
if (BanLookup.isBanned(ess, user))
149148
{
150-
final BanEntry banEntry = ess.getServer().getBanList(BanList.Type.NAME).getBanEntry(user.getName());
149+
final BanEntry banEntry = BanLookup.getBanEntry(ess, user.getName());
151150
final String reason = showBan ? banEntry.getReason() : tl("true");
152151
sender.sendMessage(tl("whoisBanned", reason));
153152
if (banEntry.getExpiration() != null)
@@ -161,6 +160,7 @@ private void seenOffline(final Server server, final CommandSource sender, User u
161160
sender.sendMessage(tl("whoisTempBanned", expireString));
162161
}
163162
}
163+
164164
final String location = user.getGeoLocation();
165165
if (location != null && (!(sender.isPlayer()) || ess.getUser(sender.getPlayer()).isAuthorized("essentials.geoip.show")))
166166
{

‎Essentials/src/com/earth2me/essentials/craftbukkit/BanLookup.java‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
package com.earth2me.essentials.craftbukkit;
2+
3+
import com.earth2me.essentials.User;
4+
import java.util.Iterator;
5+
import java.util.Set;
6+
import net.ess3.api.IEssentials;
7+
import org.bukkit.BanEntry;
8+
import org.bukkit.BanList;
9+
10+
11+
public class BanLookup
12+
{
13+
public static Boolean isBanned(IEssentials ess, User user)
14+
{
15+
return isBanned(ess, user.getName());
16+
}
17+
18+
public static Boolean isBanned(IEssentials ess, String name)
19+
{
20+
return getBanEntry(ess, name) != null;
21+
}
22+
23+
public static BanEntry getBanEntry(IEssentials ess, String name)
24+
{
25+
Set<BanEntry> benteries = ess.getServer().getBanList(BanList.Type.NAME).getBanEntries();
26+
for (BanEntry banEnt : benteries)
27+
{
28+
if (banEnt.getTarget().equals(name))
29+
{
30+
return banEnt;
31+
}
32+
}
33+
return null;
34+
}
35+
36+
}

‎Essentials/src/plugin.yml‎

Lines changed: 1 addition & 1 deletion

0 commit comments

Comments
 (0)