minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-12 17:45:08 +02:00
Code Issues Releases Wiki Activity

Fix usermap player matching

Browse Source
This commit is contained in:
ementalo
2012-10-11 16:59:07 +01:00
parent 448e718085
commit 590430fcec
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Essentials/src/net/ess3/user/UserMap.java
View File

@@ -151,7 +151,7 @@ public class UserMap extends StorageObjectMap<IUser> implements IUserMap
for (Player player : ess.getServer().getOnlinePlayers()) for (Player player : ess.getServer().getOnlinePlayers())
{ {
if (player.getName().equalsIgnoreCase(searchString) if (player.getName().equalsIgnoreCase(searchString)
&& (includeHidden || (includeOffline && getUser(player).isHidden()))) && (includeHidden || includeOffline || !getUser(player).isHidden()))
{ {
match = player; match = player;
break; break;
@@ -173,7 +173,7 @@ public class UserMap extends StorageObjectMap<IUser> implements IUserMap
final String nickname = getUser(player).getData().getNickname(); final String nickname = getUser(player).getData().getNickname();
if (nickname != null && !nickname.isEmpty() if (nickname != null && !nickname.isEmpty()
&& nickname.equalsIgnoreCase(searchString) && nickname.equalsIgnoreCase(searchString)
&& (includeHidden || (includeOffline && getUser(player).isHidden()))) && (includeHidden || includeOffline || !getUser(player).isHidden()))
{ {
if (multimatching || multisearch) if (multimatching || multisearch)
{ {
@@ -213,7 +213,7 @@ public class UserMap extends StorageObjectMap<IUser> implements IUserMap
for (Player player : ess.getServer().getOnlinePlayers()) for (Player player : ess.getServer().getOnlinePlayers())
{ {
if (player.getName().toLowerCase(Locale.ENGLISH).startsWith(searchString) if (player.getName().toLowerCase(Locale.ENGLISH).startsWith(searchString)
&& (includeHidden || (includeOffline && getUser(player).isHidden()))) && (includeHidden || includeOffline || !getUser(player).isHidden()))
{ {
result.add(getUser(player)); result.add(getUser(player));
break; break;
@@ -221,7 +221,7 @@ public class UserMap extends StorageObjectMap<IUser> implements IUserMap
final String nickname = getUser(player).getData().getNickname(); final String nickname = getUser(player).getData().getNickname();
if (nickname != null && !nickname.isEmpty() if (nickname != null && !nickname.isEmpty()
&& nickname.toLowerCase(Locale.ENGLISH).startsWith(searchString) && nickname.toLowerCase(Locale.ENGLISH).startsWith(searchString)
&& (includeHidden || (includeOffline && getUser(player).isHidden()))) && (includeHidden || includeOffline || !getUser(player).isHidden()))
{ {
result.add(getUser(player)); result.add(getUser(player));
break; break;