Merge branch '5.1_dev' into 5.1

Mountea-Framework · Aug 31, 2024 · 6187518 · 6187518
2 parents 26dec00 + 067e36e
commit 6187518
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/...ActorInteractionPlugin/Private/Components/Interactable/ActorInteractableComponentBase.cpp b/...ActorInteractionPlugin/Private/Components/Interactable/ActorInteractableComponentBase.cpp
@@ -66,17 +66,19 @@ UActorInteractableComponentBase::UActorInteractableComponentBase() :
 	bVisualizeComponent = true;
 #endif
 
-#if !UE_GAME
-#if WITH_EDITOR
-	if (GIsEditor && !GIsPlayInEditorWorld && !bInteractableInitialized)
+#if WITH_EDITOR && !UE_GAME
+
+	if (!bInteractableInitialized)
 	{
-		LOG_INFO(TEXT("[%s] Setting Default Values from Constructor"), *GetName())
-		SetDefaultValues();
+		if (GetOwner() == nullptr)
+		{
+			SetDefaultValues();
+		}
+
+		bInteractableInitialized = true;
 	}
-#endif
 #endif
 
-	bInteractableInitialized = true;
 }
 
 void UActorInteractableComponentBase::BeginPlay()
@@ -1312,6 +1314,7 @@ void UActorInteractableComponentBase::InteractorLost_Implementation(const TScrip
 
 	GetWorld()->GetTimerManager().ClearTimer(Timer_Interaction);
 	GetWorld()->GetTimerManager().ClearTimer(Timer_ProgressExpiration);
+
 	//GetWorld()->GetTimerManager().ClearTimer(Timer_Cooldown);
 
 	if (GetOwner() && GetOwner()->HasAuthority())
@@ -1330,10 +1333,6 @@ void UActorInteractableComponentBase::InteractorLost_Implementation(const TScrip
 	switch (InteractableState)
 	{
 		case EInteractableStateV2::EIS_Cooldown:
-			if (Execute_GetInteractor(this).GetObject() == nullptr)
-			{
-				Execute_SetState(this, DefaultInteractableState);
-			}
 			break;
 		case EInteractableStateV2::EIS_Asleep:
 		case EInteractableStateV2::EIS_Suppressed: