Merge branch 'development'

Panakotta00 · Mar 17, 2020 · c3b4ec6 · c3b4ec6
2 parents e33a1e8 + 9d46d8b
commit c3b4ec6
Show file tree

Hide file tree

Showing 16 changed files with 7 additions and 5 deletions.
diff --git a/Content/LightItUp/Lamps/-Shared/LampMenu/GroupEntry.uasset b/Content/LightItUp/Lamps/-Shared/LampMenu/GroupEntry.uasset
diff --git a/Content/LightItUp/Lamps/-Shared/LampMenu/LampInteraction.uasset b/Content/LightItUp/Lamps/-Shared/LampMenu/LampInteraction.uasset
diff --git a/Content/LightItUp/Lamps/-Shared/LampMenu/Textures/AddGroup.uasset b/Content/LightItUp/Lamps/-Shared/LampMenu/Textures/AddGroup.uasset
diff --git a/Content/LightItUp/Lamps/-Shared/LampMenu/Textures/DeleteGroup_Active.uasset b/Content/LightItUp/Lamps/-Shared/LampMenu/Textures/DeleteGroup_Active.uasset
diff --git a/Content/LightItUp/Lamps/-Shared/LampMenu/Textures/DeleteGroup_None.uasset b/Content/LightItUp/Lamps/-Shared/LampMenu/Textures/DeleteGroup_None.uasset
diff --git a/Content/LightItUp/Lamps/-Shared/LampMenu/Textures/DeleteGroup_Normal.uasset b/Content/LightItUp/Lamps/-Shared/LampMenu/Textures/DeleteGroup_Normal.uasset
diff --git a/Content/LightItUp/Lamps/-Shared/LampMenu/Textures/GroupModeBox.uasset b/Content/LightItUp/Lamps/-Shared/LampMenu/Textures/GroupModeBox.uasset
diff --git a/Content/LightItUp/Lamps/-Shared/LampMenu/Textures/GroupNameBox.uasset b/Content/LightItUp/Lamps/-Shared/LampMenu/Textures/GroupNameBox.uasset
diff --git a/Content/LightItUp/Lamps/-Shared/LampMenu/Textures/GroupSelected.uasset b/Content/LightItUp/Lamps/-Shared/LampMenu/Textures/GroupSelected.uasset
diff --git a/Content/LightItUp/Lamps/-Shared/LampMenu/Textures/GroupSelected_Off.uasset b/Content/LightItUp/Lamps/-Shared/LampMenu/Textures/GroupSelected_Off.uasset
diff --git a/Content/LightItUp/Lamps/-Shared/LampMenu/Textures/LampMode.uasset b/Content/LightItUp/Lamps/-Shared/LampMenu/Textures/LampMode.uasset
diff --git a/Content/LightItUp/Lamps/-Shared/LampMenu/Textures/ModeSlide_Orange.uasset b/Content/LightItUp/Lamps/-Shared/LampMenu/Textures/ModeSlide_Orange.uasset
diff --git a/Content/LightItUp/Lamps/-Shared/LampMenu/Textures/ModeSlider.uasset b/Content/LightItUp/Lamps/-Shared/LampMenu/Textures/ModeSlider.uasset
diff --git a/Content/LightItUp/Lamps/ConstructionLight/ConstructionLight.uasset b/Content/LightItUp/Lamps/ConstructionLight/ConstructionLight.uasset
diff --git a/Content/LightItUp/Lamps/PortableLight/PortableLamp.uasset b/Content/LightItUp/Lamps/PortableLight/PortableLamp.uasset
diff --git a/Source/LightItUp/LampSubsystem.cpp b/Source/LightItUp/LampSubsystem.cpp
@@ -28,6 +28,7 @@ bool ULampSubsystemRCO::SetGroup_Validate(ALampSubsystem* subsys, const FString&
 }
 
 void ULampSubsystemRCO::RemoveGroup_Implementation(ALampSubsystem* subsys, const FString& groupName) {
+	if (groupName == DefaultLampGroup || groupName.Len() < 1) return;
 	auto group = subsys->Groups.FindByKey(groupName);
 	subsys->Groups.Remove(*group);
 	subsys->ForceNetUpdate();
@@ -49,21 +50,22 @@ bool ALampSubsystem::ShouldSave_Implementation() const {
 	return true;
 }
 
-void ALampSubsystem::BeginPlay() {
-	Super::BeginPlay();
-}
-
 void ALampSubsystem::OnGroupsChanged() {
 	bool hard = Groups.Num() != LastGroupCount;
 	if (hard) LastGroupCount = Groups.Num();
 	OnGroupChanged.Broadcast(hard);
 }
 
 ALampSubsystem::ALampSubsystem() {
-	if (!Groups.Contains(DefaultLampGroup)) Groups.Add({DefaultLampGroup, AUTO});
 	bReplicates = true;
 }
 
+void ALampSubsystem::BeginPlay() {
+	Super::BeginPlay();
+	if (!Groups.Contains(FString(DefaultLampGroup))) Groups.Add({DefaultLampGroup, AUTO});
+	if (FLampGroup* group = Groups.FindByKey(TEXT(""))) Groups.Remove(*group);
+}
+
 ALampSubsystem * ALampSubsystem::Get(UWorld* world) {
 	TArray<AActor*> subsystems;
 	UGameplayStatics::GetAllActorsOfClass(world, ALampSubsystem::StaticClass(), subsystems);