Fix #10

AlmostReliable · Jan 8, 2023 · a878c09 · a878c09
1 parent f6ff948
commit a878c09
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/fabric/src/main/java/com/almostreliable/lootjs/fabric/mixin/LootTableMixin.java b/fabric/src/main/java/com/almostreliable/lootjs/fabric/mixin/LootTableMixin.java
@@ -1,5 +1,6 @@
 package com.almostreliable.lootjs.fabric.mixin;
 
+import com.almostreliable.lootjs.LootJS;
 import com.almostreliable.lootjs.LootModificationsAPI;
 import com.almostreliable.lootjs.core.LootJSParamSets;
 import com.almostreliable.lootjs.core.ILootContextData;
@@ -31,14 +32,19 @@ public abstract class LootTableMixin implements LootTableExtension {
 
     @Inject(method = "getRandomItems(Lnet/minecraft/world/level/storage/loot/LootContext;Ljava/util/function/Consumer;)V", at = @At("HEAD"), cancellable = true)
     private void invokeLootModifiers(LootContext context, Consumer<ItemStack> consumer, CallbackInfo ci) {
+        if(lootjs$getLootTableId() == null) {
+            LootJS.LOG.warn("Loot table id is null, something went wrong."); // TODO find a way to print better error
+            return;
+        }
+
         List<ItemStack> loot = new ArrayList<>();
         Consumer<ItemStack> stackSplitter = LootTable.createStackSplitter(loot::add);
         getRandomItemsRaw(context, stackSplitter);
 
         ILootContextData data = context.getParamOrNull(LootJSParamSets.DATA);
         if (data == null) {
-            throw new IllegalStateException(
-                    "Something went wrong - LootContext has no data. Please report this for the mod LootJS");
+            LootJS.LOG.debug("LootJS: No data found in context, skipping loot modifiers. Reason is probably that context was not created through LootContext$Builder");
+            return;
         }
 
         ((FabricLootContextExtension) context).lootjs$setQueriedLootTableId(lootjs$lootTableId);

diff --git a/forge/src/main/java/com/almostreliable/lootjs/forge/mixin/ForgeHooksMixin.java b/forge/src/main/java/com/almostreliable/lootjs/forge/mixin/ForgeHooksMixin.java
@@ -1,5 +1,6 @@
 package com.almostreliable.lootjs.forge.mixin;
 
+import com.almostreliable.lootjs.LootJS;
 import com.almostreliable.lootjs.LootModificationsAPI;
 import com.almostreliable.lootjs.core.LootJSParamSets;
 import com.almostreliable.lootjs.core.ILootContextData;
@@ -22,8 +23,8 @@ public class ForgeHooksMixin {
     private static void invokeActions(ResourceLocation lootTableID, ObjectArrayList<ItemStack> loot, LootContext context, CallbackInfoReturnable<ObjectArrayList<ItemStack>> cir) {
         ILootContextData data = context.getParamOrNull(LootJSParamSets.DATA);
         if (data == null) {
-            throw new IllegalStateException(
-                    "Something went wrong - LootContext has no data. Please report this for the mod LootJS");
+            LootJS.LOG.debug("LootJS: No data found in context, skipping loot modifiers. Reason is probably that context was not created through LootContext$Builder");
+            return;
         }
 
         LootModificationsAPI.invokeActions(loot, context);