Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-12-27 03:28:30 +01:00
Code Issues Projects Releases Wiki Activity

Fix NPE with /list in console

Browse Source
This commit is contained in:
KHobbits 2014-06-27 03:48:26 +01:00
parent 6269ce9a3f
commit 9b69403ee1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Essentials/src/com/earth2me/essentials/PlayerList.java
View File

@ -51,7 +51,7 @@ public class PlayerList
int hiddenCount = 0; int hiddenCount = 0;
for (Player onlinePlayer : server.getOnlinePlayers()) for (Player onlinePlayer : server.getOnlinePlayers())
{ {
if (ess.getUser(onlinePlayer).isHidden(user.getBase())) if (ess.getUser(onlinePlayer).isHidden() || (user != null && !user.getBase().canSee(onlinePlayer)))
{ {
playerHidden++; playerHidden++;
if (showHidden || user.getBase().canSee(onlinePlayer)) if (showHidden || user.getBase().canSee(onlinePlayer))
@ -80,7 +80,8 @@ public class PlayerList
for (Player onlinePlayer : server.getOnlinePlayers()) for (Player onlinePlayer : server.getOnlinePlayers())
{ {
final User onlineUser = ess.getUser(onlinePlayer); final User onlineUser = ess.getUser(onlinePlayer);
if (onlineUser.isHidden(sender.getBase()) && !showHidden && (sender != null && !sender.getBase().canSee(onlinePlayer))) if ((sender == null && !showHidden && onlineUser.isHidden()) ||
(sender != null && !showHidden && !sender.getBase().canSee(onlinePlayer)))
{ {
continue; continue;
} }