From 4aa1f9451dc3ab0ba31fe50346e5de2ef2447049 Mon Sep 17 00:00:00 2001
From: Boy <sivertpaulsen2@gmail.com>
Date: Fri, 3 Feb 2023 19:14:53 +0100
Subject: [PATCH] tweak oraxen hook for nullchecks

---
 .../com/hibiscusmc/hmccosmetics/hooks/items/LootyHook.java  | 6 +++---
 .../com/hibiscusmc/hmccosmetics/hooks/items/OraxenHook.java | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/LootyHook.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/LootyHook.java
index b000e256..53acc3fa 100644
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/LootyHook.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/LootyHook.java
@@ -2,7 +2,6 @@ package com.hibiscusmc.hmccosmetics.hooks.items;
 
 import com.mineinabyss.geary.prefabs.PrefabKey;
 import com.mineinabyss.looty.LootyFactory;
-import io.th0rgal.oraxen.api.OraxenItems;
 import org.bukkit.event.Listener;
 import org.bukkit.inventory.ItemStack;
 
@@ -14,7 +13,8 @@ public class LootyHook extends ItemHook implements Listener {
 
     @Override
     public ItemStack get(String itemid) {
-        if (PrefabKey.Companion.ofOrNull(itemid) == null) return null;
-        return LootyFactory.INSTANCE.createFromPrefab(PrefabKey.Companion.of(itemid));
+        PrefabKey prefabKey = PrefabKey.Companion.ofOrNull(itemid);
+        if (prefabKey == null) return null;
+        return LootyFactory.INSTANCE.createFromPrefab(prefabKey);
     }
 }
diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/OraxenHook.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/OraxenHook.java
index 66af757c..fd3c1b84 100644
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/OraxenHook.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/OraxenHook.java
@@ -1,6 +1,7 @@
 package com.hibiscusmc.hmccosmetics.hooks.items;
 
 import io.th0rgal.oraxen.api.OraxenItems;
+import io.th0rgal.oraxen.items.ItemBuilder;
 import org.bukkit.event.Listener;
 import org.bukkit.inventory.ItemStack;
 
@@ -12,6 +13,8 @@ public class OraxenHook extends ItemHook implements Listener {
 
     @Override
     public ItemStack get(String itemid) {
-        return OraxenItems.getItemById(itemid).build();
+        ItemBuilder builder = OraxenItems.getItemById(itemid);
+        if (builder == null) return null;
+        return builder.build();
     }
 }