Hotfix new player sync logic

Fix has_data not being checked by sync_player, dialog being stuck open if
no data is received by the master and master server refusing to server
empty data.
This commit is contained in:
Hornwitser committed 2021-09-12 00:27:46 +02:00
1 parent 8c62213a52
commit 1035389c9e
4 files changed
+8 -8

No files matched your search

@@ -28,6 +28,8 @@ local function download_inventory(player_name, data, number, total)
log("ERROR: Inventory sync failed, got empty player data for " .. player.name .. " from the master")
player.print("ERROR: Inventory sync failed, got empty player data from the master")
progress_dialog.remove(player)
-- Give the player a character and pretend that's the synced player data
ensure_character(player)
@@ -194,7 +194,10 @@ function inventory_sync.sync_player(acquire_response)
return
end
if not player_record.sync or acquire_response.generation > player_record.generation then
if
acquire_response.has_data
and (not player_record.sync or acquire_response.generation > player_record.generation)
then
inventory_sync.initiate_inventory_download(player, player_record, acquire_response.generation)
else