From 0188731c8c89bdcbd92f780ae10e927421bc1a1d Mon Sep 17 00:00:00 2001 From: Ryder Belserion Date: Thu, 16 Jan 2025 19:39:11 -0500 Subject: [PATCH] Only set glow if the config contains it. --- .../com/badbones69/crazycrates/paper/api/objects/Prize.java | 4 +++- .../crazycrates/paper/tasks/menus/CrateMainMenu.java | 2 +- .../com/badbones69/crazycrates/paper/utils/ItemUtils.java | 6 ++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/paper/src/main/java/com/badbones69/crazycrates/paper/api/objects/Prize.java b/paper/src/main/java/com/badbones69/crazycrates/paper/api/objects/Prize.java index 22f78eba6..f61b247c7 100644 --- a/paper/src/main/java/com/badbones69/crazycrates/paper/api/objects/Prize.java +++ b/paper/src/main/java/com/badbones69/crazycrates/paper/api/objects/Prize.java @@ -369,7 +369,9 @@ private void send(final Player target, final Crate crate) { //builder.addLorePlaceholder("%chance%", this.getTotalChance()); - builder.setGlowing(this.section.getBoolean("Glowing", false)); + if (this.section.contains("Glowing")) { + builder.setGlowing(this.section.getBoolean("Glowing", false)); + } builder.setDamage(this.section.getInt("DisplayDamage", 0)); diff --git a/paper/src/main/java/com/badbones69/crazycrates/paper/tasks/menus/CrateMainMenu.java b/paper/src/main/java/com/badbones69/crazycrates/paper/tasks/menus/CrateMainMenu.java index 90b3933aa..c32061863 100644 --- a/paper/src/main/java/com/badbones69/crazycrates/paper/tasks/menus/CrateMainMenu.java +++ b/paper/src/main/java/com/badbones69/crazycrates/paper/tasks/menus/CrateMainMenu.java @@ -72,7 +72,7 @@ public void open() { case "custom-model-data" -> item.setCustomModelData(Methods.tryParseInt(value).orElse(-1).intValue()); - case "glowing" -> item.setGlowing(Methods.tryParseBoolean(value).orElse(null)); + case "glowing" -> item.setGlowing(Methods.tryParseBoolean(value).orElse(false)); case "slot" -> slot = Methods.tryParseInt(value).orElse(-1).intValue(); diff --git a/paper/src/main/java/com/badbones69/crazycrates/paper/utils/ItemUtils.java b/paper/src/main/java/com/badbones69/crazycrates/paper/utils/ItemUtils.java index d9297ea6e..8f2054c5d 100644 --- a/paper/src/main/java/com/badbones69/crazycrates/paper/utils/ItemUtils.java +++ b/paper/src/main/java/com/badbones69/crazycrates/paper/utils/ItemUtils.java @@ -153,7 +153,9 @@ public static String getKey(@NotNull final PersistentDataContainerView container } public static @NotNull ItemBuilder getItem(@NotNull final ConfigurationSection section, @NotNull final ItemBuilder builder) { - builder.setGlowing(section.contains("Glowing") ? section.getBoolean("Glowing") : null); + if (section.contains("Glowing")) { + builder.setGlowing(section.getBoolean("Glowing", false)); + } builder.setDamage(section.getInt("DisplayDamage", 0)); @@ -239,7 +241,7 @@ public static ItemBuilder convertString(String itemString, String section) { itemBuilder.setEntityType(type); } } - case "glowing" -> itemBuilder.setGlowing(Boolean.parseBoolean(value)); + case "glowing" -> itemBuilder.setGlowing(Methods.tryParseBoolean(value).orElse(false)); case "amount" -> { final Optional amount = Methods.tryParseInt(value); itemBuilder.setAmount(amount.map(Number::intValue).orElse(1));