Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Factorio: fix resync not reconciling divergent history #1910

Merged
merged 1 commit into from
Jun 29, 2023
Merged

Factorio: fix resync not reconciling divergent history #1910

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions worlds/factorio/data/mod_template/control.lua
View file
Open in desktop
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