diff --git a/src/main/java/de/shiewk/smoderation/inventory/SModMenu.java b/src/main/java/de/shiewk/smoderation/inventory/SModMenu.java index c2bb440..d5049aa 100644 --- a/src/main/java/de/shiewk/smoderation/inventory/SModMenu.java +++ b/src/main/java/de/shiewk/smoderation/inventory/SModMenu.java @@ -102,7 +102,11 @@ public class SModMenu extends PageableCustomInventory { } private void reload(){ - this.punishments = container.copy().stream().filter(getFilter().filter).filter(p -> getType() == null || p.type == getType()).filter(p -> p.matchesSearchQuery(searchQuery)).sorted(getSort().comparator).toList(); + this.punishments = container.copy().stream() + .filter(getFilter().filter) + .filter(p -> getType() == null || p.type == getType()) + .filter(p -> p.matchesSearchQuery(searchQuery)) + .sorted(getSort().comparator).toList(); } public void promptSearchQuery(){ @@ -269,7 +273,11 @@ public class SModMenu extends PageableCustomInventory { ItemStack stack = new ItemStack(Material.PLAYER_HEAD); stack.editMeta(meta -> { if (meta instanceof SkullMeta skullMeta){ - skullMeta.setOwningPlayer(Bukkit.getOfflinePlayer(punishment.to)); + try { + skullMeta.setOwningPlayer(Bukkit.getOfflinePlayer(punishment.to)); + } catch (NullPointerException e) { + LOGGER.warn("Player {} has a punishment but was never on this server!", punishment.to); + }; } meta.displayName(applyFormatting(text(punishment.type.name).color(NamedTextColor.RED).decorate(TextDecoration.BOLD))); ArrayList lore = new ArrayList<>(); diff --git a/src/main/java/de/shiewk/smoderation/util/PlayerUtil.java b/src/main/java/de/shiewk/smoderation/util/PlayerUtil.java index afc6fc5..2d0f157 100644 --- a/src/main/java/de/shiewk/smoderation/util/PlayerUtil.java +++ b/src/main/java/de/shiewk/smoderation/util/PlayerUtil.java @@ -25,7 +25,7 @@ public abstract class PlayerUtil { return "CONSOLE"; } OfflinePlayer player = Bukkit.getOfflinePlayer(uuid); - return player.getName() == null ? uuid.toString() : player.getName(); + return player.getName() == null ? "Unknown Player" + uuid : player.getName(); } public static @Nullable UUID offlinePlayerUUIDByName(String name){