Skip to content

Fix a crash when launching on native Unreal #8

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
merged 2 commits into from
Jun 7, 2019
Merged

Fix a crash when launching on native Unreal #8

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c42c82b
Fix an issue where native launch would crash due to assuming that we …
ieva-improbable Jun 6, 2019
8633e5d
Refactor to make code cleaner.
ieva-improbable Jun 7, 2019
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
39 changes: 15 additions & 24 deletions Game/Source/GDKShooter/Private/Game/GDKSessionGameState.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,7 @@ void AGDKSessionGameState::RemovePlayerState(APlayerState* PlayerState)

void AGDKSessionGameState::OnRep_SessionProgress()
{
USpatialNetDriver* SpatialNetDriver = Cast<USpatialNetDriver>(GetWorld()->GetNetDriver());
bool bAuthoritativeOverSessionEntity = SpatialNetDriver->StaticComponentView->HasAuthority(SessionEntityId, SessionComponentId);

if (bAuthoritativeOverSessionEntity)
{
SendStateUpdate(SessionProgress);
}
SendStateUpdate(SessionProgress);
TimerEvent.Broadcast(SessionProgress, SessionTimer);
}

Expand All @@ -78,44 +72,41 @@ void AGDKSessionGameState::TickGameTimer()
{
SessionTimer--;

USpatialNetDriver* SpatialNetDriver = Cast<USpatialNetDriver>(GetWorld()->GetNetDriver());
bool bAuthoritativeOverSessionEntity = SpatialNetDriver->StaticComponentView->HasAuthority(SessionEntityId, SessionComponentId);

if (SessionProgress == EGDKSessionProgress::Lobby && SessionTimer <= 0)
{
UE_LOG(LogGDK, Log, TEXT("Advance GameState to Running"));
SessionProgress = EGDKSessionProgress::Running;
if (bAuthoritativeOverSessionEntity)
{
SendStateUpdate(SessionProgress);
}
SendStateUpdate(SessionProgress);
SessionTimer = GameSessionLength;
}
if (SessionProgress == EGDKSessionProgress::Running && SessionTimer <= 0)
{
UE_LOG(LogGDK, Log, TEXT("Advance GameState to Results"));
SessionProgress = EGDKSessionProgress::Results;
if (bAuthoritativeOverSessionEntity)
{
SendStateUpdate(SessionProgress);
}
SendStateUpdate(SessionProgress);
SessionTimer = ResultsSessionLength;
}
if (SessionProgress == EGDKSessionProgress::Results && SessionTimer <= 0)
{
UE_LOG(LogGDK, Log, TEXT("Advance GameState to Finished"));
SessionProgress = EGDKSessionProgress::Finished;
if (bAuthoritativeOverSessionEntity)
{
SendStateUpdate(SessionProgress);
}
SendStateUpdate(SessionProgress);
}
}
}

void AGDKSessionGameState::SendStateUpdate(EGDKSessionProgress SessionProgressState)
{
if (!GetWorld()->GetNetDriver() || !GetWorld()->GetNetDriver()->IsA<USpatialNetDriver>())
// Only send the state update if we're using Spatial networking and if we have authority over the session entity.
UNetDriver* NetDriver = GetWorld()->GetNetDriver();
if (NetDriver == nullptr || !NetDriver->IsA<USpatialNetDriver>())
{
return;
}

USpatialNetDriver* SpatialNetDriver = Cast<USpatialNetDriver>(NetDriver);
bool bAuthoritativeOverSessionEntity = SpatialNetDriver->StaticComponentView->HasAuthority(SessionEntityId, SessionComponentId);
if (!bAuthoritativeOverSessionEntity)
{
return;
}
Expand All @@ -129,7 +120,7 @@ void AGDKSessionGameState::SendStateUpdate(EGDKSessionProgress SessionProgressSt
component_update.schema_type = Schema_CreateComponentUpdate(SessionComponentId);
Schema_Object* fields_object = Schema_GetComponentUpdateFields(component_update.schema_type);
Schema_AddInt32(fields_object, 1, SessionState);
Cast<USpatialNetDriver>(GetWorld()->GetNetDriver())->Connection->SendComponentUpdate(target_entity_id, &component_update);
SpatialNetDriver->Connection->SendComponentUpdate(target_entity_id, &component_update);
}