upstream/Chisel
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Chisel.git synced 2026-11-12 08:17:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix chisel slot voiding in some conditions (#57)

Browse Source
This commit is contained in:
Maya authored and GitHub committed 2025-05-09 20:31:18 +02:00
1 parent c312d2c311
commit 477b6e354c
8 files changed
+19 -16
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/team/chisel/inventory/ContainerChisel.java
+8 -4
View File
@@ -96,6 +96,7 @@ public class ContainerChisel extends Container {
itemstack = itemstack1.copy();
if (slotIdx > InventoryChiselSelection.normalSlots) {
// clicked in player inventory
if (!this.mergeItemStack(
itemstack1,
InventoryChiselSelection.normalSlots,
@@ -104,10 +105,13 @@ public class ContainerChisel extends Container {
return null;
}
} else {
entity.inventory.setItemStack(itemstack1.copy());
slot.onPickupFromSlot(entity, itemstack1);
itemstack1 = entity.inventory.getItemStack();
entity.inventory.setItemStack(null);
// only run this logic if a chisel selection slot was clicked (i.e. not the input slot)
if (slotIdx != InventoryChiselSelection.normalSlots) {
entity.inventory.setItemStack(itemstack1.copy());
slot.onPickupFromSlot(entity, itemstack1);
itemstack1 = entity.inventory.getItemStack();
entity.inventory.setItemStack(null);
}
if (!this.mergeItemStack(
itemstack1,