monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Factorio: fix resync not reconciling divergent history

This commit is contained in:
Fabian Dill 2023-06-29 13:21:09 +02:00 committed by Fabian Dill
parent dfb3df4a8f
commit 18e0d25051
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
worlds/factorio/data/mod_template/control.lua
View File

@ -673,7 +673,7 @@ commands.add_command("ap-get-technology", "Grant a technology, used by the Archi
end end
return return
elseif progressive_technologies[item_name] ~= nil then elseif progressive_technologies[item_name] ~= nil then
if global.index_sync[index] == nil then -- not yet received prog item if global.index_sync[index] ~= item_name then -- not yet received prog item
global.index_sync[index] = item_name global.index_sync[index] = item_name
local tech_stack = progressive_technologies[item_name] local tech_stack = progressive_technologies[item_name]
for _, item_name in ipairs(tech_stack) do for _, item_name in ipairs(tech_stack) do
@ -697,7 +697,7 @@ commands.add_command("ap-get-technology", "Grant a technology, used by the Archi
end end
end end
elseif TRAP_TABLE[item_name] ~= nil then elseif TRAP_TABLE[item_name] ~= nil then
if global.index_sync[index] == nil then -- not yet received trap if global.index_sync[index] ~= item_name then -- not yet received trap
global.index_sync[index] = item_name global.index_sync[index] = item_name
game.print({"", "Received ", item_name, " from ", source}) game.print({"", "Received ", item_name, " from ", source})
TRAP_TABLE[item_name]() TRAP_TABLE[item_name]()