TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-08-05 20:12:54 +00:00
Code Issues Projects Releases Wiki Activity

Update PlayerList.java

Browse source
This commit is contained in:
montlikadani 2019-12-31 17:49:46 +01:00 • committed by GitHub
parent 552dcb56a1
commit e7be2b68a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Essentials/src/com/earth2me/essentials/PlayerList.java
View file

@ -40,7 +40,7 @@ public class PlayerList {
for (User onlinePlayer : ess.getOnlineUsers()) { for (User onlinePlayer : ess.getOnlineUsers()) {
if (onlinePlayer.isHidden() || (user != null && !user.getBase().canSee(onlinePlayer.getBase()))) { if (onlinePlayer.isHidden() || (user != null && !user.getBase().canSee(onlinePlayer.getBase()))) {
playerHidden++; playerHidden++;
if (showHidden || user.getBase().canSee(onlinePlayer.getBase())) { if (showHidden || user != null && user.getBase().canSee(onlinePlayer.getBase())) {
hiddenCount++; hiddenCount++;
} }
} }
@ -56,8 +56,7 @@ public class PlayerList {
// Build the basic player list, divided by groups. // Build the basic player list, divided by groups.
public static Map<String, List<User>> getPlayerLists(final IEssentials ess, final User sender, final boolean showHidden) { public static Map<String, List<User>> getPlayerLists(final IEssentials ess, final User sender, final boolean showHidden) {
Server server = ess.getServer(); final Map<String, List<User>> playerList = new HashMap<>();
final Map<String, List<User>> playerList = new HashMap<String, List<User>>();
for (User onlineUser : ess.getOnlineUsers()) { for (User onlineUser : ess.getOnlineUsers()) {
if ((sender == null && !showHidden && onlineUser.isHidden()) || (sender != null && !showHidden && !sender.getBase().canSee(onlineUser.getBase()))) { if ((sender == null && !showHidden && onlineUser.isHidden()) || (sender != null && !showHidden && !sender.getBase().canSee(onlineUser.getBase()))) {
continue; continue;
@ -76,7 +75,7 @@ public class PlayerList {
// Handle the merging of groups // Handle the merging of groups
public static List<User> getMergedList(final IEssentials ess, final Map<String, List<User>> playerList, final String groupName) { public static List<User> getMergedList(final IEssentials ess, final Map<String, List<User>> playerList, final String groupName) {
final Set<String> configGroups = ess.getSettings().getListGroupConfig().keySet(); final Set<String> configGroups = ess.getSettings().getListGroupConfig().keySet();
final List<User> users = new ArrayList<User>(); final List<User> users = new ArrayList<>();
for (String configGroup : configGroups) { for (String configGroup : configGroups) {
if (configGroup.equalsIgnoreCase(groupName)) { if (configGroup.equalsIgnoreCase(groupName)) {
String[] groupValues = ess.getSettings().getListGroupConfig().get(configGroup).toString().trim().split(" "); String[] groupValues = ess.getSettings().getListGroupConfig().get(configGroup).toString().trim().split(" ");