Merge from upstream

mcchampions · Feb 3, 2025 · 6166af9 · 6166af9
2 parents 9c9ae9b + 16d408e
commit 6166af9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/main/java/com/xzavier0722/mc/plugin/slimefun4/storage/adapter/sqlite/SqliteAdapter.java b/src/main/java/com/xzavier0722/mc/plugin/slimefun4/storage/adapter/sqlite/SqliteAdapter.java
@@ -36,6 +36,7 @@ public void initStorage(DataType type) {
             case BLOCK_STORAGE -> createBlockStorageTables();
         }
 
+        tableInformationTable = SqlUtils.mapTable(DataScope.TABLE_INFORMATION);
         createTableInformationTable();
     }
 

diff --git a/...ava/io/github/thebusybiscuit/slimefun4/implementation/listeners/AncientAltarListener.java b/...ava/io/github/thebusybiscuit/slimefun4/implementation/listeners/AncientAltarListener.java
@@ -309,7 +309,7 @@ public Optional<ItemStack> getRecipeOutput(ItemStack catalyst, List<ItemStack> i
         ItemStackWrapper wrapper = ItemStackWrapper.wrap(catalyst);
         List<ItemStackWrapper> items = ItemStackWrapper.wrapList(inputs);
 
-        if (SlimefunUtils.isItemSimilar(wrapper, SlimefunItems.BROKEN_SPAWNER, false, false)) {
+        if (SlimefunUtils.isItemSimilar(wrapper, SlimefunItems.BROKEN_SPAWNER, false, false, false)) {
             if (checkRecipe(SlimefunItems.BROKEN_SPAWNER, items).isEmpty()) {
                 return Optional.empty();
             }
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,6 +36,7 @@ public void initStorage(DataType type) { @@
                 case BLOCK_STORAGE -> createBlockStorageTables();
             }
+            tableInformationTable = SqlUtils.mapTable(DataScope.TABLE_INFORMATION);
             createTableInformationTable();
         }
@@ Expand Down @@