Skip to content

fix: fix profile worldtime default value and handle offline players i… #529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Nandi0813 merged 1 commit into from
May 18, 2026
Merged

fix: fix profile worldtime default value and handle offline players i… #529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 19 additions & 11 deletions core/src/main/java/dev/nandi0813/practice/manager/gui/guis/leaderboard/LbGuiUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,10 @@ public static ItemStack createEloLbItem(NormalLadder ladder) {
List<OfflinePlayer> topPlayers = new ArrayList<>();
Map<OfflinePlayer, Integer> list = leaderboard.getList();
for (OfflinePlayer player : list.keySet()) {
if (topPlayers.size() < showPlayers) topPlayers.add(player);
else break;
if (player.getName() != null && ProfileManager.getInstance().getProfile(player) != null) {
topPlayers.add(player);
}
if (topPlayers.size() >= showPlayers) break;
}

List<String> topStrings = new ArrayList<>();
Expand All @@ -171,7 +173,7 @@ public static ItemStack createEloLbItem(NormalLadder ladder) {
int stat = list.get(target);
topStrings.add(GUIFile.getString("GUIS.STATISTICS.ELO-LEADERBOARD.ICONS.LADDER-LEADERBOARD.LORE.FORMAT")
.replace("%number%", String.valueOf(i))
.replace("%player%", Objects.requireNonNull(target.getName()))
.replace("%player%", target.getName())
.replace("%ladder_elo%", String.valueOf(stat))
.replace("%division%", division != null ? Common.mmToNormal(division.getFullName()) : "")
.replace("%division_short%", division != null ? Common.mmToNormal(division.getShortName()) : ""));
Expand Down Expand Up @@ -204,8 +206,10 @@ public static ItemStack createGlobalEloLb() {
List<OfflinePlayer> topPlayers = new ArrayList<>();
Map<OfflinePlayer, Integer> list = leaderboard.getList();
for (OfflinePlayer player : list.keySet()) {
if (topPlayers.size() < showPlayers) topPlayers.add(player);
else break;
if (player.getName() != null && ProfileManager.getInstance().getProfile(player) != null) {
topPlayers.add(player);
}
if (topPlayers.size() >= showPlayers) break;
}

List<String> topStrings = new ArrayList<>();
Expand All @@ -219,7 +223,7 @@ public static ItemStack createGlobalEloLb() {
.replace("%number%", String.valueOf(i))
.replace("%division%", division != null ? Common.mmToNormal(division.getFullName()) : "")
.replace("%division_short%", division != null ? Common.mmToNormal(division.getShortName()) : "")
.replace("%player%", Objects.requireNonNull(target.getName()))
.replace("%player%", target.getName())
.replace("%global_elo%", String.valueOf(stat)));
} else {
topStrings.add(GUIFile.getString("GUIS.STATISTICS.ELO-LEADERBOARD.ICONS.GLOBAL-LEADERBOARD.LORE.FORMAT-NULL")
Expand Down Expand Up @@ -250,8 +254,10 @@ public static ItemStack createWinLbItem(NormalLadder ladder) {
List<OfflinePlayer> topPlayers = new ArrayList<>();
Map<OfflinePlayer, Integer> list = leaderboard.getList();
for (OfflinePlayer player : list.keySet()) {
if (topPlayers.size() < showPlayers) topPlayers.add(player);
else break;
if (player.getName() != null && ProfileManager.getInstance().getProfile(player) != null) {
topPlayers.add(player);
}
if (topPlayers.size() >= showPlayers) break;
}

List<String> topStrings = new ArrayList<>();
Expand Down Expand Up @@ -296,8 +302,10 @@ public static ItemStack createGlobalWinLb() {
List<OfflinePlayer> topPlayers = new ArrayList<>();
Map<OfflinePlayer, Integer> list = leaderboard.getList();
for (OfflinePlayer player : list.keySet()) {
if (topPlayers.size() < showPlayers) topPlayers.add(player);
else break;
if (player.getName() != null && ProfileManager.getInstance().getProfile(player) != null) {
topPlayers.add(player);
}
if (topPlayers.size() >= showPlayers) break;
}

List<String> topStrings = new ArrayList<>();
Expand All @@ -311,7 +319,7 @@ public static ItemStack createGlobalWinLb() {
.replace("%number%", String.valueOf(i))
.replace("%division%", division != null ? Common.mmToNormal(division.getFullName()) : "")
.replace("%division_short%", division != null ? Common.mmToNormal(division.getShortName()) : "")
.replace("%player%", Objects.requireNonNull(target.getName()))
.replace("%player%", target.getName())
.replace("%global_win%", String.valueOf(stat)));
} else {
topStrings.add(GUIFile.getString("GUIS.STATISTICS.WIN-LEADERBOARD.ICONS.GLOBAL-LEADERBOARD.LORE.FORMAT-NULL")
Expand Down
8 changes: 4 additions & 4 deletions core/src/main/java/dev/nandi0813/practice/manager/gui/guis/queue/QueueGuiUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ static String getLbString(String format, String s, Ladder ladder) {
OfflinePlayer player = players.get(placement - 1);
Profile profile = ProfileManager.getInstance().getProfile(player);

Division division = null;
if (profile != null) {
division = profile.getStats().getDivision();
if (profile == null || player.getName() == null) {
return "&cNo player found!";
}


Division division = profile.getStats().getDivision();
int score = leaderboard.getList().get(player);

return format
Expand Down
1 change: 1 addition & 0 deletions core/src/main/java/dev/nandi0813/practice/manager/leaderboard/hologram/Hologram.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,7 @@ private List<Double> buildSpacings(int lineCount, Leaderboard leaderboard) {
private List<String> buildPlacementStrings(Leaderboard leaderboard) {
Map<OfflinePlayer, Integer> playerStats = leaderboard.getList();
List<OfflinePlayer> topPlayers = playerStats.keySet().stream()
.filter(p -> p.getName() != null && ProfileManager.getInstance().getProfile(p) != null)
.limit(showStat)
.collect(Collectors.toList());

Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/dev/nandi0813/practice/manager/profile/Profile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public class Profile {
private boolean partyInvites;
private boolean allowSpectate;
private boolean privateMessages;
private ProfileWorldTime worldTime;
private ProfileWorldTime worldTime = ProfileWorldTime.DAY;
private boolean flying;
private ProfilePrefixVisibility prefixVisibility = ProfilePrefixVisibility.PREFIX_AND_SUFFIX;

Expand Down
14 changes: 12 additions & 2 deletions core/src/main/java/dev/nandi0813/practice/manager/profile/ProfileFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,12 @@ public void setDefaultData() {
config.set("settings.allowspectate", ConfigManager.getBoolean("PLAYER.DEFAULT-SETTINGS.ALLOWSPECTATE"));
config.set("settings.flying", ConfigManager.getBoolean("PLAYER.DEFAULT-SETTINGS.FLYING"));
config.set("settings.messages", ConfigManager.getBoolean("PLAYER.DEFAULT-SETTINGS.PRIVATEMESSAGE"));
config.set("settings.worldtime", ProfileWorldTime.valueOf(ConfigManager.getString("PLAYER.DEFAULT-SETTINGS.WORLD-TIME")).toString());
String defaultWorldTime = ConfigManager.getString("PLAYER.DEFAULT-SETTINGS.WORLD-TIME");
try {
config.set("settings.worldtime", ProfileWorldTime.valueOf(defaultWorldTime.toUpperCase(Locale.ROOT)).toString());
} catch (Exception ignored) {
config.set("settings.worldtime", ProfileWorldTime.DAY.toString());
}

String defaultPrefixVisibility = ConfigManager.getString("PLAYER.DEFAULT-SETTINGS.PREFIX-VISIBILITY");
try {
Expand Down Expand Up @@ -214,7 +219,12 @@ public void getData() {
profile.setAllowSpectate(config.getBoolean("settings.allowspectate"));
profile.setFlying(config.getBoolean("settings.flying"));
profile.setPrivateMessages(config.getBoolean("settings.messages"));
profile.setWorldTime(ProfileWorldTime.valueOf(config.getString("settings.worldtime")));
String rawWorldTime = config.getString("settings.worldtime", ProfileWorldTime.DAY.toString());
try {
profile.setWorldTime(ProfileWorldTime.valueOf(rawWorldTime.toUpperCase(Locale.ROOT)));
} catch (IllegalArgumentException ignored) {
profile.setWorldTime(ProfileWorldTime.DAY);
}

String rawPrefixVisibility = config.getString("settings.prefix-visibility", ProfilePrefixVisibility.PREFIX_AND_SUFFIX.toString());
try {
Expand Down