AmongUsMods/MiraAPI
1
0 Fork 0
mirror of https://github.com/All-Of-Us-Mods/MiraAPI.git synced 2026-10-20 01:46:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

slight logic adjustment to fix inactive modifier checks

Browse Source
This commit is contained in:
XtraCube committed 2025-04-04 12:42:12 -04:00
1 parent f43a542134
commit bd0aa68cb8
1 file changed
+7 -7
Download Patch File Download Diff File Expand all files Collapse all files
MiraAPI/Modifiers/ModifierComponent.cs
+7 -7
View File
@@ -511,14 +511,14 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
/// <summary> /// <summary>
/// Checks if a player has an active modifier by its type. /// Checks if a player has an active modifier by its type.
/// </summary> /// </summary>
/// <param name="checkInactive">Whether to check inactive modifiers (those pending to be added or removed).</param> /// <param name="checkInactive">Whether to check inactive modifiers (those pending to be added).</param>
/// <param name="predicate">The predicate to check the modifier.</param> /// <param name="predicate">The predicate to check the modifier.</param>
/// <typeparam name="T">The Type of the Modifier.</typeparam> /// <typeparam name="T">The Type of the Modifier.</typeparam>
/// <returns>True if the Modifier is present, false otherwise.</returns> /// <returns>True if the Modifier is present, false otherwise.</returns>
[HideFromIl2Cpp] [HideFromIl2Cpp]
public bool HasModifier<T>(bool checkInactive, Func<T, bool>? predicate=null) where T : BaseModifier public bool HasModifier<T>(bool checkInactive, Func<T, bool>? predicate=null) where T : BaseModifier
{ {
return ActiveModifiers.Exists(MatchExpr) || (checkInactive && (_toAdd.Exists(MatchExpr) || _toRemove.Exists(MatchExpr))); return ActiveModifiers.Exists(MatchExpr) || (checkInactive && _toAdd.Exists(MatchExpr));
bool MatchExpr(BaseModifier bm) => bm is T modifier && (predicate == null || predicate(modifier)); bool MatchExpr(BaseModifier bm) => bm is T modifier && (predicate == null || predicate(modifier));
} }
@@ -526,13 +526,13 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
/// Checks if a player has an active modifier by its type. /// Checks if a player has an active modifier by its type.
/// </summary> /// </summary>
/// <param name="type">The modifier type.</param> /// <param name="type">The modifier type.</param>
/// <param name="checkInactive">Whether to check inactive modifiers (those pending to be added or removed).</param> /// <param name="checkInactive">Whether to check inactive modifiers (those pending to be added).</param>
/// <param name="predicate">The predicate to check the modifier.</param> /// <param name="predicate">The predicate to check the modifier.</param>
/// <returns>True if the Modifier is present, false otherwise.</returns> /// <returns>True if the Modifier is present, false otherwise.</returns>
[HideFromIl2Cpp] [HideFromIl2Cpp]
public bool HasModifier(Type type, bool checkInactive, Func<BaseModifier, bool>? predicate=null) public bool HasModifier(Type type, bool checkInactive, Func<BaseModifier, bool>? predicate=null)
{ {
return ActiveModifiers.Exists(MatchExpr) || (checkInactive && (_toAdd.Exists(MatchExpr) || _toRemove.Exists(MatchExpr))); return ActiveModifiers.Exists(MatchExpr) || (checkInactive && _toAdd.Exists(MatchExpr));
bool MatchExpr(BaseModifier bm) => bm.GetType() == type && (predicate == null || predicate(bm)); bool MatchExpr(BaseModifier bm) => bm.GetType() == type && (predicate == null || predicate(bm));
} }
@@ -540,7 +540,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
/// Checks if a player has an active modifier by its type ID. /// Checks if a player has an active modifier by its type ID.
/// </summary> /// </summary>
/// <param name="id">The modifier's type ID.</param> /// <param name="id">The modifier's type ID.</param>
/// <param name="checkInactive">Whether to check inactive modifiers (those pending to be added or removed).</param> /// <param name="checkInactive">Whether to check inactive modifiers (those pending to be added).</param>
/// <param name="predicate">The predicate to check the modifier.</param> /// <param name="predicate">The predicate to check the modifier.</param>
/// <returns>True if the modifier is present, false otherwise.</returns> /// <returns>True if the modifier is present, false otherwise.</returns>
[HideFromIl2Cpp] [HideFromIl2Cpp]
@@ -556,12 +556,12 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
/// Checks if a player has an active modifier by its unique ID. /// Checks if a player has an active modifier by its unique ID.
/// </summary> /// </summary>
/// <param name="id">The modifier's guid.</param> /// <param name="id">The modifier's guid.</param>
/// <param name="checkInactive">Whether to check inactive modifiers (those pending to be added or removed).</param> /// <param name="checkInactive">Whether to check inactive modifiers (those pending to be added).</param>
/// <returns>True if the modifier is present, false otherwise.</returns> /// <returns>True if the modifier is present, false otherwise.</returns>
[HideFromIl2Cpp] [HideFromIl2Cpp]
public bool HasModifier(Guid id, bool checkInactive) public bool HasModifier(Guid id, bool checkInactive)
{ {
return ActiveModifiers.Exists(MatchExpr) || (checkInactive && (_toAdd.Exists(MatchExpr) || _toRemove.Exists(MatchExpr))); return ActiveModifiers.Exists(MatchExpr) || (checkInactive && _toAdd.Exists(MatchExpr));
bool MatchExpr(BaseModifier bm) => bm.UniqueId == id; bool MatchExpr(BaseModifier bm) => bm.UniqueId == id;
} }
} }