diff options
author | Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com> | 2024-05-18 15:11:33 -0400 |
---|---|---|
committer | Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com> | 2024-05-18 15:11:33 -0400 |
commit | 874a2f809d796d436462479d95a12e0b7d747703 (patch) | |
tree | 8a1127f1588b0c2dfa247230e27f8bc6b2f42ccd /src/main/java/de/hysky/skyblocker | |
parent | 7ea1157e5d1d0c41e2b5b51c8b80ead9ff20fcd0 (diff) | |
download | Skyblocker-874a2f809d796d436462479d95a12e0b7d747703.tar.gz Skyblocker-874a2f809d796d436462479d95a12e0b7d747703.tar.bz2 Skyblocker-874a2f809d796d436462479d95a12e0b7d747703.zip |
Add null safety
Diffstat (limited to 'src/main/java/de/hysky/skyblocker')
-rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/quicknav/QuickNav.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/quicknav/QuickNav.java b/src/main/java/de/hysky/skyblocker/skyblock/quicknav/QuickNav.java index fbf6a5d8..2f73f7a9 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/quicknav/QuickNav.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/quicknav/QuickNav.java @@ -8,6 +8,7 @@ import de.hysky.skyblocker.utils.datafixer.ItemStackComponentizationFixer; import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; import net.minecraft.text.Text; import net.minecraft.util.Formatting; import org.slf4j.Logger; @@ -46,9 +47,9 @@ public class QuickNav { private static QuickNavButton parseButton(QuickNavigationConfig.QuickNavItem buttonInfo, String screenTitle, int id) throws CommandSyntaxException { QuickNavigationConfig.ItemData itemData = buttonInfo.itemData; - ItemStack stack = ItemStackComponentizationFixer.fromComponentsString(itemData.item.toString(), Math.clamp(itemData.count, 1, 99), itemData.components); - boolean uiTitleMatches = false; + ItemStack stack = itemData != null && itemData.item != null && itemData.components != null ? ItemStackComponentizationFixer.fromComponentsString(itemData.item.toString(), Math.clamp(itemData.count, 1, 99), itemData.components) : new ItemStack(Items.BEDROCK); + boolean uiTitleMatches = false; try { uiTitleMatches = screenTitle.matches(buttonInfo.uiTitle); } catch (PatternSyntaxException e) { |