mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-17 23:33:12 +09:00
Let the instance decide the components of a download
The scenario no longer sends its components with the download request. The instance strips the download by its own config and sends the components it used with the first chunk. If they differ from the ones the scenario started the download with, because the config changed in between, the scenario restarts the download. A pending download is now marked with sync_in_progress instead of clearing dirty while spectating, and it is set for every download rather than only when inventories are synced. Uploads are skipped while it is set, so a player who leaves during a download with inventories off no longer uploads their stale state. SyncComponent names the components in the Lua annotations. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
ad779a8799
commit
0504fe15ed
6 files changed
+96
-30
No files matched your search
@@ -3,9 +3,11 @@ local ensure_character = require("modules/player_sync/ensure_character")
|
||||
local restore_position = require("modules/player_sync/restore_position")
|
||||
local get_script_data = require("modules/player_sync/get_script_data")
|
||||
local serialize = require("modules/player_sync/serialize")
|
||||
local compat = require("modules/clusterio/compat")
|
||||
|
||||
|
||||
local function download_inventory(player_name, data, number, total)
|
||||
--- @param components string? JSON of the components the instance sent the data with, given with the first part
|
||||
local function download_inventory(player_name, data, number, total, components)
|
||||
local player = game.get_player(player_name)
|
||||
if player == nil then
|
||||
rcon.print("Player " .. player_name .. " does not exist")
|
||||
@@ -20,6 +22,11 @@ local function download_inventory(player_name, data, number, total)
|
||||
end
|
||||
|
||||
local player_record = script_data.players[player_name]
|
||||
-- The components changed after the download was started
|
||||
local sent_components = number == 1 and components and compat.json_to_table(components)
|
||||
if sent_components and not serialize.same_components(record.components, sent_components) then
|
||||
record.restart = true
|
||||
end
|
||||
if record.restart then
|
||||
rcon.print("Restarting outdated download")
|
||||
player_sync.initiate_inventory_download(player, player_record, record.generation)
|
||||
@@ -44,6 +51,7 @@ local function download_inventory(player_name, data, number, total)
|
||||
|
||||
script_data.active_downloads[player_name] = nil
|
||||
player_record.dirty = player.connected
|
||||
player_record.sync_in_progress = false
|
||||
player_record.sync = true
|
||||
player_record.components = record.components
|
||||
player_record.generation = record.generation
|
||||
|
||||
Reference in new issue
Block a user