GabrielTofvesson/cc-utilities
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Limit stack transfer properly

Browse Source
This commit is contained in:
Gabriel Tofvesson 2024-10-12 08:27:14 +02:00
parent 3a6cb08707
commit 2e1f54c56f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
storage/itemgroup.lua
View File

@ -141,20 +141,20 @@ function ItemGroup:transferTo(target, itemCount)
local transferMax = math.min(itemCount or targetCap, targetCap, self:getItemCount()) local transferMax = math.min(itemCount or targetCap, targetCap, self:getItemCount())
local transfer = 0 local transfer = 0
for _,stack in targetGroup:_iterateStacks() do for _,stack in targetGroup:_iterateStacks() do
if transfer >= transferMax then
break
end
local targetCount = math.min(stack:getCount() + transferMax - transfer, stack:getMaxCount())
for _,from in self:_iterateStacks() do for _,from in self:_iterateStacks() do
if stack:getCount() == targetCount then if transfer >= transferMax then
goto complete
end
if stack:getCount() == stack:getMaxCount() then
goto continue goto continue
end end
local _, xfer = from:transferTo(stack, targetCount - stack:getCount()) local _, xfer = from:transferTo(stack, math.min(stack:getMaxCount() - stack:getCount(), transferMax - transfer))
transfer = transfer + xfer transfer = transfer + xfer
end end
::continue:: ::continue::
end end
::complete::
return itemCount == nil or (itemCount == transfer), transfer return itemCount == nil or (itemCount == transfer), transfer
end end