From 2df59435d03005883af53b6ee7bc2d2c1d13ca75 Mon Sep 17 00:00:00 2001 From: ChomeNS <95471003+ChomeNS@users.noreply.github.com> Date: Thu, 26 Dec 2024 08:55:47 +0700 Subject: [PATCH] fix: some emergency issue i don't know what is causing --- build-number.txt | 2 +- .../java/me/chayapak1/chomens_bot/commands/ListCommand.java | 1 + .../me/chayapak1/chomens_bot/plugins/PlayersPlugin.java | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build-number.txt b/build-number.txt index 16b75613..568efcad 100644 --- a/build-number.txt +++ b/build-number.txt @@ -1 +1 @@ -1300 \ No newline at end of file +1301 \ No newline at end of file diff --git a/src/main/java/me/chayapak1/chomens_bot/commands/ListCommand.java b/src/main/java/me/chayapak1/chomens_bot/commands/ListCommand.java index b81638ba..d459f0b9 100644 --- a/src/main/java/me/chayapak1/chomens_bot/commands/ListCommand.java +++ b/src/main/java/me/chayapak1/chomens_bot/commands/ListCommand.java @@ -39,6 +39,7 @@ public class ListCommand extends Command { final List playersComponent = new ArrayList<>(); for (PlayerEntry entry : list) { + if (entry == null) continue; playersComponent.add( Component.translatable( "%s › %s", diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java index de75e0cd..217e8282 100644 --- a/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java +++ b/src/main/java/me/chayapak1/chomens_bot/plugins/PlayersPlugin.java @@ -91,7 +91,7 @@ public class PlayersPlugin extends Bot.Listener { public final PlayerEntry getEntry (UUID uuid) { for (PlayerEntry candidate : list) { - if (candidate.profile.getId().equals(uuid)) { + if (candidate != null && candidate.profile.getId().equals(uuid)) { return candidate; } } @@ -101,7 +101,7 @@ public class PlayersPlugin extends Bot.Listener { public final PlayerEntry getEntry (String username) { for (PlayerEntry candidate : list) { - if (getName(candidate).equals(username) || candidate.usernames.contains(username)) { + if (candidate != null && (getName(candidate).equals(username) || candidate.usernames.contains(username))) { return candidate; } } @@ -111,7 +111,7 @@ public class PlayersPlugin extends Bot.Listener { public final PlayerEntry getEntry (Component displayName) { for (PlayerEntry candidate : list) { - if (candidate.displayName != null && candidate.displayName.equals(displayName)) { + if (candidate != null && candidate.displayName != null && candidate.displayName.equals(displayName)) { return candidate; } }