diff --git a/src/main/java/slimeknights/mantle/inventory/ContainerMultiModule.java b/src/main/java/slimeknights/mantle/inventory/ContainerMultiModule.java index 8abfcf2..fb6706b 100644 --- a/src/main/java/slimeknights/mantle/inventory/ContainerMultiModule.java +++ b/src/main/java/slimeknights/mantle/inventory/ContainerMultiModule.java @@ -138,45 +138,44 @@ public class ContainerMultiModule extends BaseContainer ItemStack itemstack = slot.getStack().copy(); Container container = getSlotContainer(index); + boolean nothingDone = true; // Is the slot from a module? if(container != this) { // Try moving module -> tile inventory - moveToTileInventory(itemstack); + nothingDone &= moveToTileInventory(itemstack); // Try moving module -> player inventory - if(moveToPlayerInventory(itemstack)) { - return null; - } + nothingDone &= moveToPlayerInventory(itemstack); } // Is the slot from the tile? else if(index < subContainerSlotStart || (index < playerInventoryStart && subContainerSlotStart < 0)) { // Try moving tile -> preferred modules - refillAnyContainer(itemstack, subContainers); + nothingDone &= refillAnyContainer(itemstack, subContainers); // Try moving module -> player inventory - moveToPlayerInventory(itemstack); + nothingDone &= moveToPlayerInventory(itemstack); // Try moving module -> all submodules - if(moveToAnyContainer(itemstack, subContainers)) { - return null; - } + nothingDone &= moveToAnyContainer(itemstack, subContainers); } // Slot is from the player inventory (if present) else if(index >= playerInventoryStart && playerInventoryStart >= 0) { // Try moving player -> tile inventory - moveToTileInventory(itemstack); + nothingDone &= moveToTileInventory(itemstack); // try moving player -> modules - if(moveToAnyContainer(itemstack, subContainers)) { - return null; - } + nothingDone &= moveToAnyContainer(itemstack, subContainers); } // you violated some assumption or something. Shame on you. else { return null; } + if(nothingDone) { + return null; + } + return notifySlotAfterTransfer(playerIn, itemstack, ret, slot); }