Skip to content

Fix first-sync flag for Haven #356

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

Merged
netniV merged 1 commit into from
Nov 1, 2026
Merged

Fix first-sync flag for Haven #356

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
29 changes: 12 additions & 17 deletions mods/src/patches/parts/sync.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1525,6 +1525,8 @@ static void planetary_base_data(std::unique_ptr<std::string>&& bytes)
using trackers::pieces_states;
using trackers::pieces_states_mtx;

static std::atomic_bool is_first_sync{true};

if (auto response = Digit::PrimeServer::Models::PlanetaryBase(); response.ParseFromString(*bytes)) {
http::logging::trace("PROCESS", "planetary base data", STR_FORMAT("Processing {} haven building pieces", response.pieces_size()));
auto pieces_array = json::array();
Expand All @@ -1540,19 +1542,20 @@ static void planetary_base_data(std::unique_ptr<std::string>&& bytes)
}

if (!pieces_array.empty()) {
workers::queue_data(SyncConfig::Type::Haven, pieces_array);
const bool first_sync = is_first_sync.exchange(false, std::memory_order_acq_rel);
workers::queue_data(SyncConfig::Type::Haven, pieces_array, first_sync);
}
}
}

static void planetary_map_building_data(const google::protobuf::Map<int64_t, Digit::PrimeServer::Models::PlanetaryMapData_BuildingData>& buildings)
{
// TODO: use PlanetaryMapBuildingDiff for updates during game session

using trackers::structure_states;
using trackers::structure_states_mtx;
using trackers::types::PlanetaryBaseState;

static std::atomic_bool is_first_sync{true};

auto structure_array = nlohmann::json::array();
{
std::scoped_lock lk(structure_states_mtx);
Expand All @@ -1568,7 +1571,8 @@ static void planetary_map_building_data(const google::protobuf::Map<int64_t, Dig
}

if (!structure_array.empty()) {
workers::queue_data(SyncConfig::Type::Haven, structure_array, true);
const bool first_sync = is_first_sync.exchange(false, std::memory_order_acq_rel);
workers::queue_data(SyncConfig::Type::Haven, structure_array, first_sync);
}
}

Expand All @@ -1586,7 +1590,7 @@ static void planetary_map_prosperity(std::unique_ptr<std::string>&& bytes)
http::logging::trace("PROCESS", "planetary map prosperity", STR_FORMAT("Processing prosperity={}", response.prosperity()));
const auto prosperity_array = nlohmann::json::array(
{{{"type", SyncConfig::Type::Haven + "_prosperity"}, {"prosperity", response.prosperity()}}});
workers::queue_data(SyncConfig::Type::Haven, prosperity_array, true);
workers::queue_data(SyncConfig::Type::Haven, prosperity_array);
}
}

Expand Down Expand Up @@ -2957,28 +2961,19 @@ static void HandleEntityGroup(EntityGroup* entity_group)
// haven
case EntityGroup::Type::PlanetaryBaseData:
if (sync_options.haven) {
static std::once_flag haven_init_base_flag;
std::call_once(haven_init_base_flag, [&] {
submit_async(processors::planetary_base_data);
});
submit_async(processors::planetary_base_data);
}
break;

case EntityGroup::Type::PlanetaryMapData:
if (sync_options.haven) {
static std::once_flag haven_init_map_flag;
std::call_once(haven_init_map_flag, [&] {
submit_async(processors::planetary_map_data);
});
submit_async(processors::planetary_map_data);
}
break;

case EntityGroup::Type::PlanetaryMapProsperity:
if (sync_options.haven) {
static std::once_flag haven_init_prosperity_flag;
std::call_once(haven_init_prosperity_flag, [&] {
submit_async(processors::planetary_map_prosperity);
});
submit_async(processors::planetary_map_prosperity);
}
break;

Expand Down
Loading