From ae608ff700851cc18062a2b6e24069d2bc035dbd Mon Sep 17 00:00:00 2001 From: klechenov Date: Thu, 9 Nov 2023 19:47:19 +0100 Subject: [PATCH 1/2] Avoided ENSURE_ABILITY_IS_INSTANTIATED in GetCurrentAbilitySpec() --- .../CogAbility/Private/CogAbilityWindow_Abilities.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Abilities.cpp b/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Abilities.cpp index c699538..cdabf0a 100644 --- a/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Abilities.cpp +++ b/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Abilities.cpp @@ -351,7 +351,12 @@ void FCogAbilityWindow_Abilities::RenderAbilitiesTable(UAbilitySystemComponent& //-------------------------------------------------------------------------------------------------------------------------- void FCogAbilityWindow_Abilities::RenderAbilityCooldown(const UAbilitySystemComponent& AbilitySystemComponent, UGameplayAbility& Ability) { - FGameplayAbilitySpec* Spec = Ability.GetCurrentAbilitySpec(); + if (!Ability.IsInstantiated()) + { + return; + } + + FGameplayAbilitySpec* Spec = Ability.GetCurrentAbilitySpec(); if (Spec == nullptr) { From 399b577f0e6502070702cbbecb582153f58518db Mon Sep 17 00:00:00 2001 From: Arnaud Jamin Date: Fri, 10 Nov 2023 16:25:03 -0500 Subject: [PATCH 2/2] Fix tabs --- .../CogAbility/Private/CogAbilityWindow_Abilities.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Abilities.cpp b/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Abilities.cpp index cdabf0a..bb90bf3 100644 --- a/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Abilities.cpp +++ b/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Abilities.cpp @@ -351,12 +351,12 @@ void FCogAbilityWindow_Abilities::RenderAbilitiesTable(UAbilitySystemComponent& //-------------------------------------------------------------------------------------------------------------------------- void FCogAbilityWindow_Abilities::RenderAbilityCooldown(const UAbilitySystemComponent& AbilitySystemComponent, UGameplayAbility& Ability) { - if (!Ability.IsInstantiated()) - { - return; - } + if (!Ability.IsInstantiated()) + { + return; + } - FGameplayAbilitySpec* Spec = Ability.GetCurrentAbilitySpec(); + FGameplayAbilitySpec* Spec = Ability.GetCurrentAbilitySpec(); if (Spec == nullptr) {