coradelamouche
/
waspsaliva
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

quint: fix simulate_invaction 

Before the counts were wrong and it could swap then fill
This fixes an infinite recursion bug with invaction_dump
master
cron 2020-12-11 17:34:14 +00:00
parent 51f23d53a1
commit 40585ac60a
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
clientmods/quint/init.lua
View File

@ -58,21 +58,23 @@ local function simulate_invaction(lists, invaction)
if tis:is_empty() then
lists[tidx][tslot] = fis
lists[fidx][fslot] = ItemStack()
return
end
-- swap
if ((fis:get_name() ~= tis:get_name())
or (fis:get_name() == tis:get_name()
and fis:get_count() > tis:get_free_space())
or (tcount > tis:get_free_space())) then
or (fis:get_name() == tis:get_name()
and tcount > tis:get_free_space())
or (tcount > tis:get_free_space())) then
local t = fis
lists[fidx][fslot] = tis
lists[tidx][tslot] = t
return
end
-- fill
if fis:get_name() == tis:get_name() and fis:get_count() <= tis:get_free_space() then
count = math.min(fis:get_count(), tis:get_free_space(), tcount)
if fis:get_name() == tis:get_name() and tcount <= tis:get_free_space() then
local count = math.min(fis:get_count(), tis:get_free_space(), tcount)
lists[tidx][tslot]:set_count(tis:get_count() + count)
@ -81,6 +83,8 @@ local function simulate_invaction(lists, invaction)
else
lists[fidx][fslot]:set_count(fis:get_count() - count)
end
return
end
end