Merge branch '5.3_dev' into 5.3

Mountea-Framework · Aug 31, 2024 · 035de6a · 035de6a
2 parents 9760643 + 1cee901
commit 035de6a
Showing 1 changed file with 12 additions and 16 deletions.
diff --git a/...ActorInteractionPlugin/Private/Components/Interactable/ActorInteractableComponentBase.cpp b/...ActorInteractionPlugin/Private/Components/Interactable/ActorInteractableComponentBase.cpp
@@ -71,20 +71,19 @@ UActorInteractableComponentBase::UActorInteractableComponentBase() :
 	bVisualizeComponent = true;
 #endif
 
-#if !UE_GAME
-#if WITH_EDITOR || WITH_EDITORONLY_DATA
-	if (GIsEditor && !GIsPlayInEditorWorld)
-	{
-		RequestEditorDefaults.AddUObject(this, &UActorInteractableComponentBase::ResetDefaults);
-	}
-	if (GIsEditor && !GIsPlayInEditorWorld && !bInteractableInitialized)
+#if WITH_EDITOR && !UE_GAME
+
+	if (!bInteractableInitialized)
 	{
-		SetDefaultValues();
+		if (GetOwner() == nullptr)
+		{
+			SetDefaultValues();
+		}
+
+		bInteractableInitialized = true;
 	}
 #endif
-#endif
-
-	bInteractableInitialized = true;
+
 }
 
 void UActorInteractableComponentBase::BeginPlay()
@@ -1320,7 +1319,8 @@ void UActorInteractableComponentBase::InteractorLost_Implementation(const TScrip
 
 	GetWorld()->GetTimerManager().ClearTimer(Timer_Interaction);
 	GetWorld()->GetTimerManager().ClearTimer(Timer_ProgressExpiration);
-	GetWorld()->GetTimerManager().ClearTimer(Timer_Cooldown);
+
+	//GetWorld()->GetTimerManager().ClearTimer(Timer_Cooldown);
 
 	if (GetOwner() && GetOwner()->HasAuthority())
 	{
@@ -1338,10 +1338,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: