summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorementalo <ementalodev@gmx.co.uk>2012-10-11 16:59:07 +0100
committerementalo <ementalodev@gmx.co.uk>2012-10-11 16:59:07 +0100
commit590430fcec682b190d6ab1f697cbf10c42623fbc (patch)
tree2c658ad4630298ff3af921db2fdf1ff9db5a264e
parent448e71808532deb5c7046577ee0f344995b1bdd7 (diff)
downloadEssentials-590430fcec682b190d6ab1f697cbf10c42623fbc.tar
Essentials-590430fcec682b190d6ab1f697cbf10c42623fbc.tar.gz
Essentials-590430fcec682b190d6ab1f697cbf10c42623fbc.tar.lz
Essentials-590430fcec682b190d6ab1f697cbf10c42623fbc.tar.xz
Essentials-590430fcec682b190d6ab1f697cbf10c42623fbc.zip
Fix usermap player matching
-rw-r--r--Essentials/src/net/ess3/user/UserMap.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/Essentials/src/net/ess3/user/UserMap.java b/Essentials/src/net/ess3/user/UserMap.java
index eb1a63094..815fad8f6 100644
--- a/Essentials/src/net/ess3/user/UserMap.java
+++ b/Essentials/src/net/ess3/user/UserMap.java
@@ -151,7 +151,7 @@ public class UserMap extends StorageObjectMap<IUser> implements IUserMap
for (Player player : ess.getServer().getOnlinePlayers())
{
if (player.getName().equalsIgnoreCase(searchString)
- && (includeHidden || (includeOffline && getUser(player).isHidden())))
+ && (includeHidden || includeOffline || !getUser(player).isHidden()))
{
match = player;
break;
@@ -173,7 +173,7 @@ public class UserMap extends StorageObjectMap<IUser> implements IUserMap
final String nickname = getUser(player).getData().getNickname();
if (nickname != null && !nickname.isEmpty()
&& nickname.equalsIgnoreCase(searchString)
- && (includeHidden || (includeOffline && getUser(player).isHidden())))
+ && (includeHidden || includeOffline || !getUser(player).isHidden()))
{
if (multimatching || multisearch)
{
@@ -213,7 +213,7 @@ public class UserMap extends StorageObjectMap<IUser> implements IUserMap
for (Player player : ess.getServer().getOnlinePlayers())
{
if (player.getName().toLowerCase(Locale.ENGLISH).startsWith(searchString)
- && (includeHidden || (includeOffline && getUser(player).isHidden())))
+ && (includeHidden || includeOffline || !getUser(player).isHidden()))
{
result.add(getUser(player));
break;
@@ -221,7 +221,7 @@ public class UserMap extends StorageObjectMap<IUser> implements IUserMap
final String nickname = getUser(player).getData().getNickname();
if (nickname != null && !nickname.isEmpty()
&& nickname.toLowerCase(Locale.ENGLISH).startsWith(searchString)
- && (includeHidden || (includeOffline && getUser(player).isHidden())))
+ && (includeHidden || includeOffline || !getUser(player).isHidden()))
{
result.add(getUser(player));
break;