Skip to content

Commit

Permalink
Factorio: fix resync not reconciling divergent history
Browse files Browse the repository at this point in the history
  • Loading branch information
Berserker66 committed Jun 29, 2023
1 parent dfb3df4 commit 18e0d25
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions worlds/factorio/data/mod_template/control.lua
Original file line number Diff line number Diff line change
Expand Up @@ -673,7 +673,7 @@ commands.add_command("ap-get-technology", "Grant a technology, used by the Archi
end
return
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
local tech_stack = progressive_technologies[item_name]
for _, item_name in ipairs(tech_stack) do
Expand All @@ -697,7 +697,7 @@ commands.add_command("ap-get-technology", "Grant a technology, used by the Archi
end
end
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
game.print({"", "Received ", item_name, " from ", source})
TRAP_TABLE[item_name]()
Expand Down

0 comments on commit 18e0d25

Please sign in to comment.