Merge remote-tracking branch 'origin/master-1.20-lts' into master-1.21

CyclopsMC · Sep 9, 2024 · b73f783 · b73f783
2 parents 0aabcf4 + 4fc88b7
commit b73f783
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/resources/changelog/1.19.2-1.2.40.txt b/resources/changelog/1.19.2-1.2.40.txt
@@ -0,0 +1,6 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.17.0 or higher.
+
+Fixes:
+* Fix Spirit Furnace not resuming after drained by hopper, Closes #1058
+
diff --git a/resources/changelog/1.20.1-1.2.47.txt b/resources/changelog/1.20.1-1.2.47.txt
@@ -0,0 +1,6 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.18.4 or higher.
+
+Fixes:
+* Fix Spirit Furnace not resuming after drained by hopper, Closes #1058
+
diff --git a/src/main/java/org/cyclops/evilcraft/blockentity/BlockEntitySpiritFurnace.java b/src/main/java/org/cyclops/evilcraft/blockentity/BlockEntitySpiritFurnace.java
@@ -178,7 +178,16 @@ public void registerTankInventoryCapabilitiesItem() {
                     (blockEntity, direction) -> new ItemHandlerSlotMasked(
                             blockEntity.getInventory(),
                             (direction == Direction.UP || direction == Direction.DOWN) ? SLOTS_DROP : new int[]{SLOT_BOX, SLOT_CONTAINER}
-                    )
+                    ) {
+                        @Override
+                        public ItemStack extractItem(int slot, int amount, boolean simulate) {
+                            ItemStack extracted = super.extractItem(slot, amount, simulate);
+                            if (slot > SLOT_BOX && !extracted.isEmpty() && !simulate) {
+                                blockEntity.resetWork(false);
+                            }
+                            return extracted;
+                        }
+                    }
             );
         }
     }