fix: ClassCastException in fabric-loot-api-v2 (23w14a) (#2999)

* fix: ClassCastException in fabric-loot-api-v2 * change: Add skipped entries into new table * add: Simple test case
FabricMC · Apr 6, 2023 · 965d93c · 965d93c
1 parent 158c189
commit 965d93c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/fabric-loot-api-v2/src/main/java/net/fabricmc/fabric/mixin/loot/LootManagerMixin.java b/fabric-loot-api-v2/src/main/java/net/fabricmc/fabric/mixin/loot/LootManagerMixin.java
@@ -69,7 +69,11 @@ private void applyLootTableEvents(ResourceManager resourceManager, LootManager l
 				return;
 			}
 
-			LootTable table = (LootTable) entry;
+			if (!(entry instanceof LootTable table)) {
+				// We only want to modify loot tables
+				newTables.put(id, entry);
+				return;
+			}
 
 			LootTableSource source = LootUtil.determineSource(id.location(), resourceManager);
 			// Invoke the REPLACE event for the current loot table.

diff --git a/fabric-loot-api-v2/src/testmod/resources/data/minecraft/loot_tables/blocks/red_wool.json b/fabric-loot-api-v2/src/testmod/resources/data/minecraft/loot_tables/blocks/red_wool.json
@@ -10,6 +10,10 @@
         }
       ],
       "conditions": [
+        {
+          "condition": "minecraft:reference",
+          "name": "minecraft:match_tool_shears"
+        },
         {
           "condition": "minecraft:survives_explosion"
         }

diff --git a/fabric-loot-api-v2/src/testmod/resources/data/minecraft/predicates/match_tool_shears.json b/fabric-loot-api-v2/src/testmod/resources/data/minecraft/predicates/match_tool_shears.json
@@ -0,0 +1,8 @@
+{
+  "condition": "minecraft:match_tool",
+  "predicate": {
+    "items": [
+      "minecraft:shears"
+    ]
+  }
+}