Empty modifiers wont apply now

PipeRift · Oct 25, 2019 · 0d75a9e · 0d75a9e
1 parent 59f36b7
commit 0d75a9e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/Source/Attributes/Private/BaseAttr.cpp b/Source/Attributes/Private/BaseAttr.cpp
@@ -9,6 +9,11 @@ uint32 FBaseAttr::IdCount{ 0 };
 
 void FBaseAttr::AddModifier(const FAttrModifier& Modifier, const FAttrCategory& Category)
 {
+	if (Modifier.IsEmpty())
+	{
+		return;
+	}
+
 	if (Category == FAttrCategory::NoCategory)
 	{
 		BaseModifiers.Add(Modifier);

diff --git a/Source/Attributes/Private/Int32Attr.cpp b/Source/Attributes/Private/Int32Attr.cpp
@@ -43,4 +43,7 @@ void FInt32Attr::InternalRefreshValue(FAttributeChangeInfo&& ChangeInfo)
 	}
 
 	Value = FMath::RoundToInt(TempValue);
+
+	// Notify changes
+	OnModified.Broadcast(LastValue, ChangeInfo);
 }
diff --git a/Source/Attributes/Public/AttrModifier.h b/Source/Attributes/Public/AttrModifier.h
@@ -116,6 +116,8 @@ struct ATTRIBUTES_API FAttrModifier
 	}
 
 	bool NetSerialize(FArchive& Ar, class UPackageMap* Map, bool& bOutSuccess);
+
+	bool IsEmpty() const;
 };
 
 template<>
@@ -166,3 +168,10 @@ inline bool FAttrModifier::NetSerialize(FArchive& Ar, UPackageMap* Map, bool& bO
 	bOutSuccess = true;
 	return true;
 }
+
+inline bool FAttrModifier::IsEmpty() const
+{
+	return FMath::IsNearlyZero(Increment)
+		&& FMath::IsNearlyZero(LastMultiplier)
+		&& FMath::IsNearlyZero(BaseMultiplier);
+}