mirror of
https://github.com/GTNewHorizons/Mantle.git
synced 2026-11-19 19:49:41 +00:00
Try fixing shift-click duping when only the last condition for moving fails
This commit is contained in:
1 parent
448bb9e173
commit
858c6ed033
1 file changed
+12
-13
@@ -138,45 +138,44 @@ public class ContainerMultiModule<T extends TileEntity> extends BaseContainer<T>
|
||||
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);
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user