From e1d09df0ccd9938a8854bdfb4358709701108ce7 Mon Sep 17 00:00:00 2001
From: Pug <81167232+MerchantPug@users.noreply.github.com>
Date: Thu, 14 Mar 2024 13:24:13 +1100
Subject: [PATCH] Apoli: Fix EdwinMindcraft/origins-architectury#425.

---
 .../java/io/github/apace100/apoli/mixin/LootTableMixin.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/github/apace100/apoli/mixin/LootTableMixin.java b/src/main/java/io/github/apace100/apoli/mixin/LootTableMixin.java
index d05984e5b..4ac043668 100644
--- a/src/main/java/io/github/apace100/apoli/mixin/LootTableMixin.java
+++ b/src/main/java/io/github/apace100/apoli/mixin/LootTableMixin.java
@@ -41,7 +41,7 @@ public abstract class LootTableMixin {
 
     @Inject(method = "getRandomItems(Lnet/minecraft/world/level/storage/loot/LootContext;)Lit/unimi/dsi/fastutil/objects/ObjectArrayList;", at = @At("HEAD"), cancellable = true)
     private void modifyLootTable(LootContext context, CallbackInfoReturnable<ObjectArrayList<ItemStack>> cir) {
-        if(((ReplacingLootContext)context).isReplaced((LootTable)(Object)this)) {
+        if(((ReplacingLootContext)context).isReplaced((LootTable)(Object)this) || lootTableId == null) {
             return;
         }
 
@@ -94,7 +94,7 @@ private void modifyLootTable(LootContext context, CallbackInfoReturnable<ObjectA
 
     @Inject(method = "getRandomItemsRaw(Lnet/minecraft/world/level/storage/loot/LootContext;Ljava/util/function/Consumer;)V", at = @At("HEAD"), cancellable = true)
     private void setReplacedLootTable(LootContext context, Consumer<ItemStack> lootConsumer, CallbackInfo ci) {
-        if (this.lootTableId.equals(ReplaceLootTablePower.REPLACED_TABLE_UTIL_ID)) {
+        if (this.lootTableId != null && this.lootTableId.equals(ReplaceLootTablePower.REPLACED_TABLE_UTIL_ID)) {
             LootTable replace = ReplaceLootTablePower.peek();
             replace.getRandomItemsRaw(context, lootConsumer);
             ci.cancel();