diff options
Diffstat (limited to 'Essentials/src/net/ess3/user/UserMap.java')
| -rw-r--r-- | Essentials/src/net/ess3/user/UserMap.java | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/Essentials/src/net/ess3/user/UserMap.java b/Essentials/src/net/ess3/user/UserMap.java index 7c0ac22e4..d9adfaead 100644 --- a/Essentials/src/net/ess3/user/UserMap.java +++ b/Essentials/src/net/ess3/user/UserMap.java @@ -1,21 +1,17 @@ package net.ess3.user; +import static net.ess3.I18n._; import java.io.File; -import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedHashSet; -import java.util.Locale; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.regex.Pattern; +import org.bukkit.entity.Player; import net.ess3.api.IEssentials; import net.ess3.api.IUser; import net.ess3.api.IUserMap; import net.ess3.api.InvalidNameException; import net.ess3.storage.StorageObjectMap; import net.ess3.utils.FormatUtil; -import org.bukkit.entity.Player; -import static net.ess3.I18n._; + public class UserMap extends StorageObjectMap<IUser> implements IUserMap { @@ -145,6 +141,7 @@ public class UserMap extends StorageObjectMap<IUser> implements IUserMap { return matchUsers(name, false, false, requester); } + private final Pattern comma = Pattern.compile(","); public Set<IUser> matchUsers(final String name, final boolean includeHidden, final boolean includeOffline, final Player requester) @@ -174,8 +171,7 @@ public class UserMap extends StorageObjectMap<IUser> implements IUserMap Player match = null; for (Player player : ess.getServer().getOnlinePlayers()) { - if (player.getName().equalsIgnoreCase(searchString) - && (includeHidden || includeOffline || requester == null || requester.canSee(player))) + if (player.getName().equalsIgnoreCase(searchString) && (includeHidden || includeOffline || requester == null || requester.canSee(player))) { match = player; break; @@ -195,9 +191,8 @@ public class UserMap extends StorageObjectMap<IUser> implements IUserMap for (Player player : ess.getServer().getOnlinePlayers()) { final String nickname = getUser(player).getData().getNickname(); - if (nickname != null && !nickname.isEmpty() - && nickname.equalsIgnoreCase(searchString) - && (includeHidden || includeOffline || requester == null || requester.canSee(player))) + if (nickname != null && !nickname.isEmpty() && nickname.equalsIgnoreCase( + searchString) && (includeHidden || includeOffline || requester == null || requester.canSee(player))) { if (multimatching || multisearch) { @@ -236,16 +231,15 @@ public class UserMap extends StorageObjectMap<IUser> implements IUserMap { for (Player player : ess.getServer().getOnlinePlayers()) { - if (player.getName().toLowerCase(Locale.ENGLISH).startsWith(searchString) - && (includeHidden || includeOffline || requester == null || requester.canSee(player))) + if (player.getName().toLowerCase(Locale.ENGLISH).startsWith( + searchString) && (includeHidden || includeOffline || requester == null || requester.canSee(player))) { result.add(getUser(player)); break; } final String nickname = getUser(player).getData().getNickname(); - if (nickname != null && !nickname.isEmpty() - && nickname.toLowerCase(Locale.ENGLISH).startsWith(searchString) - && (includeHidden || includeOffline || requester == null || requester.canSee(player))) + if (nickname != null && !nickname.isEmpty() && nickname.toLowerCase(Locale.ENGLISH).startsWith( + searchString) && (includeHidden || includeOffline || requester == null || requester.canSee(player))) { result.add(getUser(player)); break; |