Merge branch '1.20.1' into 1.19.4

This commit is contained in:
DBotThePony 2024-01-01 16:51:04 +07:00
commit 5ad9d49537
Signed by: DBot
GPG Key ID: DCC23B5715498507

View File

@ -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)
}