mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-12 23:04:52 +09:00
bbassieandClaude Opus 5.5
b0e07ea73b
The controller merged uploads using the uploading instance's current config. An upload serialized under different settings, for example one sent from the save right after an admin turned on sync_inventories and restarted the instance, was then merged as if it held a character and wiped the stored one. Uploads now carry the components they were serialized with, the controller merges by those and drops the key before storing. The scenario keeps the components a player's synced session started with and serializes their upload with them, so changing the options while a player is online takes effect the next time they join. A player whose session lacks a component that is now synced downloads again even if the generation matches. Downloads snapshot the components when they start, so a change during a download can't mix two sets. A failed acquire unsyncs the player again regardless of the inventories setting, as before this branch. The god and dead player inventories move from the inventories component to the controller one, matching what the scenario syncs, which removes the special case in mergePlayerData. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
83 lines
2.7 KiB
Lua
83 lines
2.7 KiB
Lua
local progress_dialog = require("modules/player_sync/gui/progress_dialog")
|
|
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 function download_inventory(player_name, data, number, total)
|
|
local player = game.get_player(player_name)
|
|
if player == nil then
|
|
rcon.print("Player " .. player_name .. " does not exist")
|
|
return
|
|
end
|
|
|
|
local script_data = get_script_data()
|
|
local record = script_data.active_downloads[player_name]
|
|
if record == nil then
|
|
rcon.print("No active download is in progress for " .. player_name)
|
|
return
|
|
end
|
|
|
|
local player_record = script_data.players[player_name]
|
|
if record.restart then
|
|
rcon.print("Restarting outdated download")
|
|
player_sync.initiate_inventory_download(player, player_record, record.generation)
|
|
return
|
|
end
|
|
|
|
if total == 0 then
|
|
-- Download was requested but the player had no data stored.
|
|
log("ERROR: Player sync failed, got empty player data for " .. player.name .. " from the controller")
|
|
player.print("ERROR: Player sync failed, got empty player data from the controller")
|
|
|
|
progress_dialog.remove(player)
|
|
|
|
-- Give the player a character and pretend that's the synced player data
|
|
if serialize.syncs(record.components, "controller") or player_record.local_controller then
|
|
ensure_character(player)
|
|
end
|
|
player_record.local_controller = nil
|
|
|
|
-- Restore player position and driving state
|
|
restore_position(player, record)
|
|
|
|
script_data.active_downloads[player_name] = nil
|
|
player_record.dirty = player.connected
|
|
player_record.sync = true
|
|
player_record.components = record.components
|
|
player_record.generation = record.generation
|
|
return
|
|
end
|
|
|
|
record.data = record.data .. data
|
|
|
|
-- Show progress in console
|
|
-- player.print("Downloaded "..(number + 1).."/"..total.." parts")
|
|
if number ~= total then
|
|
-- Show progress in GUI
|
|
progress_dialog.display(player, number, total)
|
|
|
|
-- Update activity to indicate this session is still going
|
|
record.last_active = game.ticks_played
|
|
return
|
|
end
|
|
|
|
-- Download is complete
|
|
progress_dialog.remove(player)
|
|
|
|
-- Remove download session and store finished download
|
|
script_data.active_downloads[player_name] = nil
|
|
script_data.finished_downloads[player_name] = record
|
|
|
|
local ticks = game.ticks_played - record.started
|
|
player.print("Imported player data in " .. ticks .. " ticks")
|
|
log("Imported player data for " .. player_name .. " in " .. ticks .. " ticks")
|
|
|
|
if player.connected then
|
|
player_sync.finish_download(player, record)
|
|
end
|
|
end
|
|
|
|
return download_inventory
|