From 2b794e6836d4059d54aed75164ff5c3ef76a9a1e Mon Sep 17 00:00:00 2001
From: Bryce Douglas Olcott <10872719@uvu.edu>
Date: Tue, 14 Oct 2025 10:43:10 -0600
Subject: [PATCH] Auto stash before rebase of "main" onto "main/main"

---
 .../MAIN_CONTENT/Blueprints/BP_MagickPlayerState.uasset       | 4 ++--
 .../MAIN_CONTENT/Blueprints/BP_PlayerController.uasset        | 4 ++--
 Elistria_Calling/Content/MAIN_CONTENT/UI/WB_MainHUD.uasset    | 4 ++--
 .../Elistria_Calling/Public/Attributes/HealthAttributeSet.h   | 3 +--
 .../Elistria_Calling/Public/Attributes/LevelAttributeSet.h    | 1 -
 .../Elistria_Calling/Public/Attributes/StaminaAttributeSet.h  | 2 +-
 .../Source/Elistria_Calling/Public/ElistriaAttributeSetBase.h | 1 +
 7 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_MagickPlayerState.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_MagickPlayerState.uasset
index c5b6db7..95a633c 100644
--- a/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_MagickPlayerState.uasset
+++ b/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_MagickPlayerState.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:44e635069eba770b39cc2593a10e201b40f47e8d84e59d2963831ce381903fa7
-size 49867
+oid sha256:32c737068ad3102e827b56fc507ec6f09af31675de8b39bb5f5a9425bcbba782
+size 55159
diff --git a/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerController.uasset b/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerController.uasset
index 9c57922..f84b3e1 100644
--- a/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerController.uasset
+++ b/Elistria_Calling/Content/MAIN_CONTENT/Blueprints/BP_PlayerController.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:969ecde8698d0f7fb2796bf5c4cd52afb540f2788208f004af0d4b60c5052f68
-size 707992
+oid sha256:4b657eaa907256967eb6a9c092a2aaddfa2fc4a53e48e018fadf0e0c76d64ab6
+size 707950
diff --git a/Elistria_Calling/Content/MAIN_CONTENT/UI/WB_MainHUD.uasset b/Elistria_Calling/Content/MAIN_CONTENT/UI/WB_MainHUD.uasset
index 6189449..b3be350 100644
--- a/Elistria_Calling/Content/MAIN_CONTENT/UI/WB_MainHUD.uasset
+++ b/Elistria_Calling/Content/MAIN_CONTENT/UI/WB_MainHUD.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5e102c291868bdd6dcf61acdccdd2849837e991c3e7a76eac25ac6aafb9b5fb0
-size 341438
+oid sha256:81e2593f5452315c2bf8eedbef85b46afcb57aa4a5ac50cb8f95435a67e38800
+size 336607
diff --git a/Elistria_Calling/Source/Elistria_Calling/Public/Attributes/HealthAttributeSet.h b/Elistria_Calling/Source/Elistria_Calling/Public/Attributes/HealthAttributeSet.h
index f0326e3..d232e1b 100644
--- a/Elistria_Calling/Source/Elistria_Calling/Public/Attributes/HealthAttributeSet.h
+++ b/Elistria_Calling/Source/Elistria_Calling/Public/Attributes/HealthAttributeSet.h
@@ -13,8 +13,7 @@
 /**
  * 
  */
-DECLARE_DYNAMIC_MULTICAST_DELEGATE_ThreeParams(FAttributeChangedEvent, UAttributeSet*, AttributeSet, float, OldValue,
-                                               float, NewValue);
+
 UCLASS()
 class ELISTRIA_CALLING_API UHealthAttributeSet : public UElistriaAttributeSetBase
 {
diff --git a/Elistria_Calling/Source/Elistria_Calling/Public/Attributes/LevelAttributeSet.h b/Elistria_Calling/Source/Elistria_Calling/Public/Attributes/LevelAttributeSet.h
index efe685d..af6f0b1 100644
--- a/Elistria_Calling/Source/Elistria_Calling/Public/Attributes/LevelAttributeSet.h
+++ b/Elistria_Calling/Source/Elistria_Calling/Public/Attributes/LevelAttributeSet.h
@@ -13,7 +13,6 @@
 /**
  * 
  */
-DECLARE_DYNAMIC_MULTICAST_DELEGATE_ThreeParams(FAttributeChangedEvent, UAttributeSet*, AttributeSet, float, OldValue, float, NewValue);
 UCLASS()
 class ELISTRIA_CALLING_API ULevelAttributeSet : public UElistriaAttributeSetBase
 {
diff --git a/Elistria_Calling/Source/Elistria_Calling/Public/Attributes/StaminaAttributeSet.h b/Elistria_Calling/Source/Elistria_Calling/Public/Attributes/StaminaAttributeSet.h
index bee9076..956a511 100644
--- a/Elistria_Calling/Source/Elistria_Calling/Public/Attributes/StaminaAttributeSet.h
+++ b/Elistria_Calling/Source/Elistria_Calling/Public/Attributes/StaminaAttributeSet.h
@@ -11,7 +11,7 @@
 /**
  * 
  */
-DECLARE_DYNAMIC_MULTICAST_DELEGATE_ThreeParams(FAttributeChangedEvent, UAttributeSet*, AttributeSet, float, OldValue, float, NewValue);
+
 UCLASS()
 class ELISTRIA_CALLING_API UStaminaAttributeSet : public UElistriaAttributeSetBase
 {
diff --git a/Elistria_Calling/Source/Elistria_Calling/Public/ElistriaAttributeSetBase.h b/Elistria_Calling/Source/Elistria_Calling/Public/ElistriaAttributeSetBase.h
index 03ac048..b351967 100644
--- a/Elistria_Calling/Source/Elistria_Calling/Public/ElistriaAttributeSetBase.h
+++ b/Elistria_Calling/Source/Elistria_Calling/Public/ElistriaAttributeSetBase.h
@@ -15,6 +15,7 @@
 	GAMEPLAYATTRIBUTE_VALUE_SETTER(PropertyName) \
 	GAMEPLAYATTRIBUTE_VALUE_INITTER(PropertyName)
 
+DECLARE_DYNAMIC_MULTICAST_DELEGATE_ThreeParams(FAttributeChangedEvent, UAttributeSet*, AttributeSet, float, OldValue, float, NewValue);
 UCLASS()
 class ELISTRIA_CALLING_API UElistriaAttributeSetBase : public UAttributeSet
 {