Port BlockBuilder fix from #765 to 1.20

KubeJS-Mods · Jan 6, 2024 · d1aad04 · d1aad04
1 parent d98f808
commit d1aad04
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/common/src/main/java/dev/latvian/mods/kubejs/block/BlockBuilder.java b/common/src/main/java/dev/latvian/mods/kubejs/block/BlockBuilder.java
@@ -468,7 +468,12 @@ public BlockBuilder item(@Nullable Consumer<BlockItemBuilder> i) {
 			itemBuilder = null;
 			lootTable = EMPTY;
 		} else {
-			i.accept(getOrCreateItemBuilder());
+			if (itemBuilder == null) {
+				itemBuilder = getOrCreateItemBuilder();
+				itemBuilder.blockBuilder = this;
+				ScriptType.STARTUP.console.warn("`item` is called with non-null builder callback after block item is set to null! Creating another block item as fallback.");
+			}
+			i.accept(itemBuilder);
 		}
 
 		return this;