Merge branch '1.20.2' into 1.20.1
This commit is contained in:
commit
54fa8a252e
@ -1393,7 +1393,7 @@ class MatteryPlayerCapability(val ply: Player) : ICapabilityProvider, INBTSerial
|
||||
combinedInventory.consumeItem(stack, false, slots = offhandSlotRange, onlyIntoExisting = true, popTime = 5)
|
||||
inventoryAndExopack.consumeItem(stack, false, onlyIntoExisting = false, popTime = 5)
|
||||
} else {
|
||||
wrappedInventory.consumeItem(stack, false, slots = IntSet.of(ply.inventory.selected), onlyIntoExisting = false, popTime = 5)
|
||||
wrappedInventory.consumeItem(stack, false, slots = IntSet.of(ply.inventory.selected), onlyIntoExisting = true, popTime = 5)
|
||||
wrappedInventory.consumeItem(stack, false, slots = offhandSlotRange, onlyIntoExisting = true, popTime = 5)
|
||||
wrappedItemInventory.consumeItem(stack, false, onlyIntoExisting = false, popTime = 5)
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user