spatialos
diff --git a/.gitignore b/.gitignore
@@ -15,6 +15,9 @@
 **/Intermediate/
 **/Saved/
 
+# Built data for maps
+*_BuiltData.uasset
+
 # SpatialOS files
 logs
 build/

diff --git a/DeployGame.bat b/DeployGame.bat
@@ -14,7 +14,7 @@ set deploymentname=%gamename%%formatdate%
 cd spatial/
 spatial build build-config || goto :error
 spatial cloud upload %deploymentname% --force || goto :error
-spatial cloud launch %deploymentname% one_worker_test.json %deploymentname% --snapshot=snapshots/default.snapshot --cluster_region=eu || goto :error
+spatial cloud launch %deploymentname% one_worker_test.json %deploymentname% --snapshot=snapshots/default.snapshot --cluster_region=eu --runtime_version=0.4.3 || goto :error
 spatial project deployment tags add %deploymentname% dev_login || goto :error
 spatial project deployment tags add %deploymentname% status_lobby || goto :error
 

diff --git a/Game/Config/DefaultEngine.ini b/Game/Config/DefaultEngine.ini
@@ -1,10 +1,10 @@
 [/Script/EngineSettings.GameMapsSettings]
-GameDefaultMap=/Game/Maps/Deployments.Deployments
-EditorStartupMap=/Game/Maps/FPS-Start_Tiny.FPS-Start_Tiny
-GlobalDefaultGameMode=/Game/GameMode/BP_DeathmatchGameMode.BP_DeathmatchGameMode_C
-GameInstanceClass=/Script/SpatialGDK.SpatialGameInstance
+GameDefaultMap=/Engine/Maps/Entry.Entry
+EditorStartupMap=/Game/Maps/Control_Small.Control_Small
+GlobalDefaultGameMode=/Game/GameMode/BP_ControlGameMode.BP_ControlGameMode_C
+GameInstanceClass=/Game/GameMode/BP_GDKShooterGameInstance.BP_GDKShooterGameInstance_C
 GlobalDefaultServerGameMode=None
-ServerDefaultMap=/Game/Maps/FPS-Start_Medium.FPS-Start_Medium
+ServerDefaultMap=/Game/Maps/Control_Small.Control_Small
 
 [/Script/IOSRuntimeSettings.IOSRuntimeSettings]
 MinimumiOSVersion=IOS_11

diff --git a/Game/Config/DefaultGame.ini b/Game/Config/DefaultGame.ini
@@ -4,12 +4,14 @@ ProjectName=SpatialOS Unreal GDK Shooter
 CopyrightNotice=Copyright (c) Improbable Worlds Ltd, All Rights Reserved
 bSpatialNetworking=True
 
-[/Script/UnrealEd.ProjectPackagingSettings]
-+DirectoriesToAlwaysCook=(Path="Spatial")
-
 [/Script/Engine.RendererSettings]
 r.LightPropagationVolume = 1
 
 [/Script/Engine.GameSession]
 MaxPlayers=100
 MaxSpectators=100
+
+[/Script/UnrealEd.ProjectPackagingSettings]
++MapsToCook=(FilePath="/Game/Maps/Control_Medium")
++MapsToCook=(FilePath="/Game/Maps/Control_Small")
++DirectoriesToAlwaysCook=(Path="/Game/Spatial")
diff --git a/Game/Config/DefaultSpatialGDKSettings.ini b/Game/Config/DefaultSpatialGDKSettings.ini
@@ -43,5 +43,5 @@ UdpServerUpstreamUpdateIntervalMS=1
 UdpServerDownstreamUpdateIntervalMS=1
 UdpClientUpstreamUpdateIntervalMS=1
 UdpClientDownstreamUpdateIntervalMS=1
-SpatialDebugger=BlueprintGeneratedClass'/Game/Blueprints/LoadBalancing/BP_VerboseSpatialDebugger.BP_VerboseSpatialDebugger_C'
+SpatialDebugger=None
 
diff --git a/Game/Content/AI/BB_NPC.uasset b/Game/Content/AI/BB_NPC.uasset
diff --git a/Game/Content/AI/BB_Wander.uasset b/Game/Content/AI/BB_Wander.uasset
diff --git a/Game/Content/AI/BT_Wander.uasset b/Game/Content/AI/BT_Wander.uasset
diff --git a/Game/Content/Blueprints/BP_ControlPoint.uasset b/Game/Content/Blueprints/BP_ControlPoint.uasset
diff --git a/Game/Content/Blueprints/Enum_ControlPointState.uasset b/Game/Content/Blueprints/Enum_ControlPointState.uasset
diff --git a/Game/Content/Blueprints/MapBuilder/BP_MapBuilder.uasset b/Game/Content/Blueprints/MapBuilder/BP_MapBuilder.uasset
diff --git a/Game/Content/Blueprints/MapBuilder/BP_SpawnRemoverVolume.uasset b/Game/Content/Blueprints/MapBuilder/BP_SpawnRemoverVolume.uasset
diff --git a/Game/Content/Blueprints/MapBuilder/BP_TileTypeVolume.uasset b/Game/Content/Blueprints/MapBuilder/BP_TileTypeVolume.uasset
diff --git a/Game/Content/Blueprints/MapBuilder/Data/D_TileCollections.uasset b/Game/Content/Blueprints/MapBuilder/Data/D_TileCollections.uasset
diff --git a/Game/Content/Blueprints/MapBuilder/Data/E_TileCollectionEnum.uasset b/Game/Content/Blueprints/MapBuilder/Data/E_TileCollectionEnum.uasset
diff --git a/Game/Content/Blueprints/MapBuilder/Data/F_TileCollectionStruct.uasset b/Game/Content/Blueprints/MapBuilder/Data/F_TileCollectionStruct.uasset
diff --git a/Game/Content/Blueprints/MapBuilder/Data/M_TileVolume.uasset b/Game/Content/Blueprints/MapBuilder/Data/M_TileVolume.uasset
diff --git a/Game/Content/Blueprints/MapBuilder/Tiles/Misc/BP_Tile_Structure_Courtyard_A.uasset b/Game/Content/Blueprints/MapBuilder/Tiles/Misc/BP_Tile_Structure_Courtyard_A.uasset
diff --git a/Game/Content/Blueprints/MapBuilder/Tiles/Misc/BP_Tile_Structure_Tower_A.uasset b/Game/Content/Blueprints/MapBuilder/Tiles/Misc/BP_Tile_Structure_Tower_A.uasset
diff --git a/Game/Content/Blueprints/NPCs/BB_NPC.uasset b/Game/Content/Blueprints/NPCs/BB_NPC.uasset
diff --git a/Game/Content/Blueprints/NPCs/BTService_FireAtTarget.uasset b/Game/Content/Blueprints/NPCs/BTService_FireAtTarget.uasset
diff --git a/Game/Content/Blueprints/NPCs/BTTask_ClearBlackboardValue.uasset b/Game/Content/Blueprints/NPCs/BTTask_ClearBlackboardValue.uasset
diff --git a/Game/Content/Blueprints/NPCs/BTTask_FindPatrolPoint.uasset b/Game/Content/Blueprints/NPCs/BTTask_FindPatrolPoint.uasset
diff --git a/Game/Content/Blueprints/NPCs/BTTask_ScanForEnemies.uasset b/Game/Content/Blueprints/NPCs/BTTask_ScanForEnemies.uasset
diff --git a/Game/Content/Blueprints/NPCs/BTTask_TetheredMoveTo.uasset b/Game/Content/Blueprints/NPCs/BTTask_TetheredMoveTo.uasset
diff --git a/Game/Content/Blueprints/NPCs/BTTask_UnocupyPatrolPoint.uasset b/Game/Content/Blueprints/NPCs/BTTask_UnocupyPatrolPoint.uasset
diff --git a/Game/Content/Blueprints/NPCs/BT_NPC.uasset b/Game/Content/Blueprints/NPCs/BT_NPC.uasset
diff --git a/Game/Content/Blueprints/NPCs/Character_NPC.uasset b/Game/Content/Blueprints/NPCs/Character_NPC.uasset
diff --git a/Game/Content/Blueprints/NPCs/NPCSpawner.uasset b/Game/Content/Blueprints/NPCs/NPCSpawner.uasset
diff --git a/Game/Content/Blueprints/NPCs/NPCTraceProvider.uasset b/Game/Content/Blueprints/NPCs/NPCTraceProvider.uasset
diff --git a/Game/Content/Blueprints/NPCs/NPC_Controller.uasset b/Game/Content/Blueprints/NPCs/NPC_Controller.uasset
diff --git a/Game/Content/Blueprints/NPCs/PatrolPoint.uasset b/Game/Content/Blueprints/NPCs/PatrolPoint.uasset
diff --git a/Game/Content/Characters/BP_Base_Character.uasset b/Game/Content/Characters/BP_Base_Character.uasset
diff --git a/Game/Content/Characters/BP_CrashBot.uasset b/Game/Content/Characters/BP_CrashBot.uasset
diff --git a/Game/Content/Characters/BP_CrashBot_PlacedInWorld.uasset b/Game/Content/Characters/BP_CrashBot_PlacedInWorld.uasset
diff --git a/Game/Content/Characters/BP_FPS_Character.uasset b/Game/Content/Characters/BP_FPS_Character.uasset
diff --git a/Game/Content/Characters/BP_SimulatedPlayerCharacter.uasset b/Game/Content/Characters/BP_SimulatedPlayerCharacter.uasset
diff --git a/Game/Content/Characters/Components/BP_FloatingCombatText.uasset b/Game/Content/Characters/Components/BP_FloatingCombatText.uasset
diff --git a/Game/Content/Characters/Player/Animations/AnimationBlueprints/CH_Robot_AnimBlueprint.uasset b/Game/Content/Characters/Player/Animations/AnimationBlueprints/CH_Robot_AnimBlueprint.uasset
diff --git a/Game/Content/Characters/Player/Materials/ColourSchemes/CH_MI_PlayerRobot_Main_Black.uasset b/Game/Content/Characters/Player/Materials/ColourSchemes/CH_MI_PlayerRobot_Main_Black.uasset
diff --git a/Game/Content/Controllers/BP_CrashBotController.uasset b/Game/Content/Controllers/BP_CrashBotController.uasset
diff --git a/Game/Content/Controllers/BP_DeploymentController.uasset b/Game/Content/Controllers/BP_DeploymentController.uasset
diff --git a/Game/Content/Controllers/BP_GDK_PlayerController.uasset b/Game/Content/Controllers/BP_GDK_PlayerController.uasset
diff --git a/Game/Content/Controllers/BP_SimulatedPlayerAIController.uasset b/Game/Content/Controllers/BP_SimulatedPlayerAIController.uasset
diff --git a/Game/Content/Environment/Props/Materials/M_ControlPoint.uasset b/Game/Content/Environment/Props/Materials/M_ControlPoint.uasset
diff --git a/Game/Content/Environment/TeamPlayerStart.uasset b/Game/Content/Environment/TeamPlayerStart.uasset
diff --git a/Game/Content/GameMode/BP_ControlGameMode.uasset b/Game/Content/GameMode/BP_ControlGameMode.uasset
diff --git a/Game/Content/GameMode/BP_ControlGameState.uasset b/Game/Content/GameMode/BP_ControlGameState.uasset
diff --git a/Game/Content/GameMode/BP_CorridorGameMode.uasset b/Game/Content/GameMode/BP_CorridorGameMode.uasset
diff --git a/Game/Content/GameMode/BP_CorridorGameState.uasset b/Game/Content/GameMode/BP_CorridorGameState.uasset
diff --git a/Game/Content/GameMode/BP_DeathmatchGameMode.uasset b/Game/Content/GameMode/BP_DeathmatchGameMode.uasset
diff --git a/Game/Content/GameMode/BP_DeathmatchGameState.uasset b/Game/Content/GameMode/BP_DeathmatchGameState.uasset
diff --git a/Game/Content/GameMode/BP_DeploymentGameMode.uasset b/Game/Content/GameMode/BP_DeploymentGameMode.uasset
diff --git a/Game/Content/GameMode/BP_GDKShooterGameInstance.uasset b/Game/Content/GameMode/BP_GDKShooterGameInstance.uasset
diff --git a/Game/Content/GameMode/BP_GymGameMode.uasset b/Game/Content/GameMode/BP_GymGameMode.uasset
diff --git a/Game/Content/GameMode/BP_GymGameState.uasset b/Game/Content/GameMode/BP_GymGameState.uasset
diff --git a/Game/Content/GameMode/BP_PlayerState.uasset b/Game/Content/GameMode/BP_PlayerState.uasset
diff --git a/Game/Content/GameMode/BP_TeamDeathmatchGameState.uasset b/Game/Content/GameMode/BP_TeamDeathmatchGameState.uasset
diff --git a/Game/Content/Maps/Control_Medium.umap b/Game/Content/Maps/Control_Medium.umap
diff --git a/Game/Content/Maps/Control_Small.umap b/Game/Content/Maps/Control_Small.umap
diff --git a/Game/Content/Maps/Corridor_Gym.umap b/Game/Content/Maps/Corridor_Gym.umap
diff --git a/Game/Content/Maps/Corridor_Gym_BuiltData.uasset b/Game/Content/Maps/Corridor_Gym_BuiltData.uasset
diff --git a/Game/Content/Maps/CrashBot_Gym.umap b/Game/Content/Maps/CrashBot_Gym.umap
diff --git a/Game/Content/Maps/CrashBot_Gym_BuiltData.uasset b/Game/Content/Maps/CrashBot_Gym_BuiltData.uasset
diff --git a/Game/Content/Maps/Deployments.umap b/Game/Content/Maps/Deployments.umap
diff --git a/Game/Content/Maps/FPS-Start_Large.umap b/Game/Content/Maps/FPS-Start_Large.umap
diff --git a/Game/Content/Maps/FPS-Start_Large_BuiltData.uasset b/Game/Content/Maps/FPS-Start_Large_BuiltData.uasset
diff --git a/Game/Content/Maps/FPS-Start_Large_Limited_Spawns.umap b/Game/Content/Maps/FPS-Start_Large_Limited_Spawns.umap
diff --git a/Game/Content/Maps/FPS-Start_Large_Limited_Spawns_BuiltData.uasset b/Game/Content/Maps/FPS-Start_Large_Limited_Spawns_BuiltData.uasset
diff --git a/Game/Content/Maps/FPS-Start_Medium.umap b/Game/Content/Maps/FPS-Start_Medium.umap
diff --git a/Game/Content/Maps/FPS-Start_Medium_BuiltData.uasset b/Game/Content/Maps/FPS-Start_Medium_BuiltData.uasset
diff --git a/Game/Content/Maps/FPS-Start_Small.umap b/Game/Content/Maps/FPS-Start_Small.umap
diff --git a/Game/Content/Maps/FPS-Start_SmallTown.umap b/Game/Content/Maps/FPS-Start_SmallTown.umap
diff --git a/Game/Content/Maps/FPS-Start_SmallTown_BuiltData.uasset b/Game/Content/Maps/FPS-Start_SmallTown_BuiltData.uasset
diff --git a/Game/Content/Maps/FPS-Start_Small_BuiltData.uasset b/Game/Content/Maps/FPS-Start_Small_BuiltData.uasset
diff --git a/Game/Content/Maps/FPS-Start_Tiny.umap b/Game/Content/Maps/FPS-Start_Tiny.umap
diff --git a/Game/Content/Maps/FPS-Start_Tiny_BuiltData.uasset b/Game/Content/Maps/FPS-Start_Tiny_BuiltData.uasset
diff --git a/Game/Content/Maps/FPS_Test_Gym_01.umap b/Game/Content/Maps/FPS_Test_Gym_01.umap
diff --git a/Game/Content/Maps/FPS_Test_Gym_01_BuiltData.uasset b/Game/Content/Maps/FPS_Test_Gym_01_BuiltData.uasset
diff --git a/Game/Content/UI/Blueprints/BP_ControlPointProgress.uasset b/Game/Content/UI/Blueprints/BP_ControlPointProgress.uasset
diff --git a/Game/Content/UI/Blueprints/BP_GDK_HUD.uasset b/Game/Content/UI/Blueprints/BP_GDK_HUD.uasset
diff --git a/Game/Content/UI/Blueprints/BP_HUD_Control.uasset b/Game/Content/UI/Blueprints/BP_HUD_Control.uasset
diff --git a/Game/Content/UI/Blueprints/BP_HUD_CorridorShooter.uasset b/Game/Content/UI/Blueprints/BP_HUD_CorridorShooter.uasset
diff --git a/Game/Content/UI/Blueprints/BP_HUD_Deathmatch.uasset b/Game/Content/UI/Blueprints/BP_HUD_Deathmatch.uasset
diff --git a/Game/Content/UI/Blueprints/BP_HUD_Gym.uasset b/Game/Content/UI/Blueprints/BP_HUD_Gym.uasset
diff --git a/Game/Content/UI/Blueprints/BP_PlayerHUD_Control.uasset b/Game/Content/UI/Blueprints/BP_PlayerHUD_Control.uasset
diff --git a/Game/Content/UI/Blueprints/BP_RespawnMenu.uasset b/Game/Content/UI/Blueprints/BP_RespawnMenu.uasset
diff --git a/Game/Content/UI/Blueprints/BP_TeamDeathmatch_LoginScreen.uasset b/Game/Content/UI/Blueprints/BP_TeamDeathmatch_LoginScreen.uasset
diff --git a/Game/Content/UI/Blueprints/Deployments/BP_GDKDeploymentWidget.uasset b/Game/Content/UI/Blueprints/Deployments/BP_GDKDeploymentWidget.uasset
diff --git a/Game/Content/UI/Blueprints/Deployments/BP_HUD_Deployments.uasset b/Game/Content/UI/Blueprints/Deployments/BP_HUD_Deployments.uasset
diff --git a/Game/Content/UI/Blueprints/Deployments/BP_Loading.uasset b/Game/Content/UI/Blueprints/Deployments/BP_Loading.uasset
diff --git a/Game/Content/UI/Blueprints/Deployments/BP_LobbyScreen.uasset b/Game/Content/UI/Blueprints/Deployments/BP_LobbyScreen.uasset
diff --git a/Game/Content/UI/Blueprints/Scores/BP_GDKTeamDeathmatchScoreboard.uasset b/Game/Content/UI/Blueprints/Scores/BP_GDKTeamDeathmatchScoreboard.uasset
diff --git a/Game/Content/UI/Blueprints/Scores/BP_ScoreTableWidget.uasset b/Game/Content/UI/Blueprints/Scores/BP_ScoreTableWidget.uasset
diff --git a/Game/Content/UI/Blueprints/Scores/BP_TeamScoreTable.uasset b/Game/Content/UI/Blueprints/Scores/BP_TeamScoreTable.uasset
diff --git a/Game/Content/UI/Textures/UI_T_Text_Back.uasset b/Game/Content/UI/Textures/UI_T_Text_Back.uasset
diff --git a/Game/Content/UI/Textures/UI_T_Text_Browse.uasset b/Game/Content/UI/Textures/UI_T_Text_Browse.uasset
diff --git a/Game/Content/UI/Textures/UI_T_Text_Connecting.uasset b/Game/Content/UI/Textures/UI_T_Text_Connecting.uasset
diff --git a/Game/Content/UI/Textures/UI_T_Text_Connection_Failed.uasset b/Game/Content/UI/Textures/UI_T_Text_Connection_Failed.uasset
diff --git a/Game/Content/UI/Textures/UI_T_Text_Enter_Your_Name_Here.uasset b/Game/Content/UI/Textures/UI_T_Text_Enter_Your_Name_Here.uasset
diff --git a/Game/Content/UI/Textures/UI_T_Text_Join.uasset b/Game/Content/UI/Textures/UI_T_Text_Join.uasset
diff --git a/Game/Content/UI/Textures/UI_T_Text_Join_Game.uasset b/Game/Content/UI/Textures/UI_T_Text_Join_Game.uasset
diff --git a/Game/Content/UI/Textures/UI_T_Text_Joining_Deployment.uasset b/Game/Content/UI/Textures/UI_T_Text_Joining_Deployment.uasset
diff --git a/Game/Content/UI/Textures/UI_T_Text_Player_Spawn_Failed.uasset b/Game/Content/UI/Textures/UI_T_Text_Player_Spawn_Failed.uasset
diff --git a/Game/Content/UI/Textures/UI_T_Text_Press_Space_To_Connect.uasset b/Game/Content/UI/Textures/UI_T_Text_Press_Space_To_Connect.uasset
diff --git a/Game/Content/UI/Textures/UI_T_Text_Press_Space_To_Retry.uasset b/Game/Content/UI/Textures/UI_T_Text_Press_Space_To_Retry.uasset
diff --git a/Game/Content/UI/Textures/UI_T_Text_Quick_Join.uasset b/Game/Content/UI/Textures/UI_T_Text_Quick_Join.uasset
diff --git a/Game/Content/UI/Textures/UI_T_Text_Ready_To_Connect.uasset b/Game/Content/UI/Textures/UI_T_Text_Ready_To_Connect.uasset
diff --git a/Game/Content/UI/Textures/UI_T_Text_Worker_Disconnected.uasset b/Game/Content/UI/Textures/UI_T_Text_Worker_Disconnected.uasset
diff --git a/Game/Content/UI/Textures/UI_T_Text_You_Have_Died.uasset b/Game/Content/UI/Textures/UI_T_Text_You_Have_Died.uasset
diff --git a/Game/Content/UI/Textures/UI_T_Title_Deployment_List.uasset b/Game/Content/UI/Textures/UI_T_Title_Deployment_List.uasset
diff --git a/Game/Content/UI/Textures/UI_T_Title_Matchmaking.uasset b/Game/Content/UI/Textures/UI_T_Title_Matchmaking.uasset
diff --git a/Game/Source/GDKShooter/Private/Characters/Components/HealthComponent.cpp b/Game/Source/GDKShooter/Private/Characters/Components/HealthComponent.cpp
@@ -80,6 +80,10 @@ void UHealthComponent::TakeDamage(float Damage, const FDamageEvent& DamageEvent,
 		if (InstigatorPlayerState != nullptr)
 		{
 			InstigatorPlayerId = InstigatorPlayerState->PlayerId;
+			if (const UTeamComponent* TeamComponent = InstigatorPlayerState->FindComponentByClass<UTeamComponent>())
+			{
+				InstigatorTeamId = TeamComponent->GetTeam();
+			}
 		}
 	}
 	if (IGenericTeamAgentInterface* InstgatorTeam = Cast<IGenericTeamAgentInterface>(EventInstigator))
@@ -157,6 +161,8 @@ void UHealthComponent::TakeDamage(float Damage, const FDamageEvent& DamageEvent,
 		{
 			GetOwner()->GetWorldTimerManager().SetTimer(ArmourRegenerationHandle, this, &UHealthComponent::RegenerateArmour, ArmourRegenInterval, true, ArmourRegenCooldown);
 		}
+
+		AuthoritativeDamage.Broadcast(EventInstigator);
 	}
 }
 
@@ -214,7 +220,7 @@ void UHealthComponent::OnRep_CurrentHealth()
 	}
 }
 
-void UHealthComponent::MulticastDamageTaken_Implementation(float Value, FVector Source, FVector Impact, int32 PlayerId, FGenericTeamId TeamId)
+void UHealthComponent::MulticastDamageTaken_Implementation(float Value, FVector Source, FVector Impact, int32 InstigatorPlayerId, FGenericTeamId InstigatorTeamId)
 {
-	DamageTaken.Broadcast(Value, Source, Impact, PlayerId, TeamId);
+	DamageTaken.Broadcast(Value, Source, Impact, InstigatorPlayerId, InstigatorTeamId);
 }
diff --git a/Game/Source/GDKShooter/Private/Characters/Components/TeamComponent.cpp b/Game/Source/GDKShooter/Private/Characters/Components/TeamComponent.cpp
@@ -21,6 +21,11 @@ void UTeamComponent::GetLifetimeReplicatedProps(TArray<FLifetimeProperty>& OutLi
 
 bool UTeamComponent::CanDamageActor(AActor* OtherActor)
 {
+	if (!IsValid(OtherActor))
+	{
+		return false;
+	}
+
 	if (bAllowFriendlyFire)
 	{
 		return true;

diff --git a/Game/Source/GDKShooter/Private/Controllers/Components/ControllerEventsComponent.cpp b/Game/Source/GDKShooter/Private/Controllers/Components/ControllerEventsComponent.cpp
@@ -21,6 +21,10 @@ void UControllerEventsComponent::Death_Implementation(const AController* Killer)
 		{
 			ClientInformOfDeath(KillerPlayerState->GetPlayerName(), KillerPlayerState->PlayerId);
 		}
+		else
+		{
+			ClientInformOfDeath(TEXT("") /*PlayerName*/, -1 /*PlayerID*/);
+		}
 	}
 }
 

diff --git a/Game/Source/GDKShooter/Private/Controllers/Components/TeamSettingComponent.cpp b/Game/Source/GDKShooter/Private/Controllers/Components/TeamSettingComponent.cpp
@@ -9,16 +9,22 @@ UTeamSettingComponent::UTeamSettingComponent()
 	PrimaryComponentTick.bCanEverTick = false;
 }
 
-void UTeamSettingComponent::BeginPlay()
+void UTeamSettingComponent::UpdateTeam(FGenericTeamId InTeamId)
 {
-	Super::BeginPlay();	
+	TeamId = InTeamId;
 	if (AAIController* OwningController = Cast<AAIController>(GetOwner()))
 	{
 		OwningController->SetGenericTeamId(TeamId);
 	}
-	else 
+	else
 	{
 		UE_LOG(LogGDK, Error, TEXT("TeamSettingComponent is designed to work with AIControllers, will not work with %s"), *GetOwner()->GetName());
 	}
 }
 
+void UTeamSettingComponent::BeginPlay()
+{
+	Super::BeginPlay();
+	UpdateTeam(TeamId);
+}
+
diff --git a/Game/Source/GDKShooter/Private/Deployments/DeploymentsPlayerController.cpp b/Game/Source/GDKShooter/Private/Deployments/DeploymentsPlayerController.cpp
diff --git a/Game/Source/GDKShooter/Private/GDKShooterFunctionLibrary.cpp b/Game/Source/GDKShooter/Private/GDKShooterFunctionLibrary.cpp
@@ -0,0 +1,52 @@
+// Copyright (c) Improbable Worlds Ltd, All Rights Reserved
+
+#include "GDKShooterFunctionLibrary.h"
+#include "GameFramework/Pawn.h"
+#include "Perception/AIPerceptionStimuliSourceComponent.h"
+
+
+void UGDKShooterFunctionLibrary::SetGenericTeamId(AActor* Actor, FGenericTeamId NewTeamId)
+{
+	IGenericTeamAgentInterface* TeamAgentActor = Cast<IGenericTeamAgentInterface>(Actor);
+	IGenericTeamAgentInterface* TeamAgentController = nullptr;
+	if (APawn* AsPawn = Cast<APawn>(Actor))
+	{
+		TeamAgentController = Cast<IGenericTeamAgentInterface>(AsPawn->GetController());
+	}
+
+	if (TeamAgentActor != nullptr)
+	{
+		TeamAgentActor->SetGenericTeamId(NewTeamId);
+	}
+
+	if (TeamAgentController != nullptr)
+	{
+		TeamAgentController->SetGenericTeamId(NewTeamId);
+	}
+
+	if (UAIPerceptionStimuliSourceComponent* PerceptionStimuli = Actor->FindComponentByClass<UAIPerceptionStimuliSourceComponent>())
+	{
+		PerceptionStimuli->UnregisterFromPerceptionSystem();
+		PerceptionStimuli->RegisterWithPerceptionSystem();
+	}
+}
+
+FGenericTeamId UGDKShooterFunctionLibrary::GetGenericTeamId(AActor* Actor)
+{
+	IGenericTeamAgentInterface* TeamAgent = Cast<IGenericTeamAgentInterface>(Actor);
+
+	if (TeamAgent == nullptr)
+	{
+		if (APawn* AsPawn = Cast<APawn>(Actor))
+		{
+			TeamAgent = Cast<IGenericTeamAgentInterface>(AsPawn->GetController());
+		}
+	}
+
+	if (TeamAgent != nullptr)
+	{
+		return TeamAgent->GetGenericTeamId();
+	}
+
+	return FGenericTeamId::NoTeam;
+}
-Original file line number
+Diff line change
@@ Expand Up @@
     		{
     			ClientInformOfDeath(KillerPlayerState->GetPlayerName(), KillerPlayerState->PlayerId);
     		}
+    		else
+    		{
+    			ClientInformOfDeath(TEXT("") /*PlayerName*/, -1 /*PlayerID*/);
+    		}
     	}
     }
@@ Expand Down @@