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> 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 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();