Noodlemire
/
rnd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'louisroyer-fix_paging' 

fix buggy duplication menu pages when nothing is researched
master
Noodlemire 2020-07-15 18:52:22 -05:00
parent 967a68169f d91523434b
commit dce9ec9604
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
duplication.lua
View File

@ -115,7 +115,7 @@ local function duplication_formspec(player, page)
end
----The page number label's text is stored here because it is used more than once.
local pageString = tostring(rnd.duplication.currentPage[pname]).."/"..tostring(math.ceil(countComplete(pname) / 32))
local pageString = tostring(rnd.duplication.currentPage[pname]).."/"..tostring(math.max(math.ceil(countComplete(pname) / 32), 1))
--With all of the above information, the formspec can be formed here.
--Note that every time information changes, the menu is reformed.
@ -176,10 +176,10 @@ local function on_player_receive_fields_duplication(player, formname, fields, co
page = math.max(1, page - 1)
--Increase the page number. If it exceeds the last page, set it back to the last page.
elseif fields["next"] then
page = math.min(math.ceil(countComplete(pname) / 32), page + 1)
page = math.max(1, math.min(math.ceil(countComplete(pname) / 32), page + 1))
--Get the amount of pages to find the last page.
elseif fields["last"] then
page = math.ceil(countComplete(pname) / 32)
page = math.max(math.ceil(countComplete(pname) / 32), 1)
end
--When a page changes, the duplication menu has to be reformed.

1
research.lua
View File

@ -236,7 +236,6 @@ minetest.register_allow_player_inventory_action(function(player, action, invento
end
--If we got this far, we can let the itemstack into the research inventory.
return inventory_info.count
end
--For sorting purposes, the next part of the function is in duplication.lua.