Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Resonance] Fix flags set #2760

Merged
merged 3 commits into from
Jul 28, 2024
Merged

[Resonance] Fix flags set #2760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f72b2e9
Fix
ITeMbI4 Jul 27, 2024
b51a985
Merge branch 'dev' into FixFlagsSetter
xNexusACS Jul 28, 2024
2326b93
Merge branch 'dev' into FixFlagsSetter
xNexusACS Jul 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Exiled.API/Extensions/EffectTypeExtension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ or EffectType.Corroding or EffectType.Decontaminating or EffectType.Hemorrhage o
/// <param name="effect">The <see cref="EffectType"/>.</param>
/// <returns>Whether or not the effect is a negative effect.</returns>
/// <seealso cref="IsHarmful(EffectType)"/>
public static bool IsNegative(this EffectType effect) => IsHarmful(effect) || GetEffectBase(effect)?.Classification is StatusEffectBase.EffectClassification.Negative;
public static bool IsNegative(this EffectType effect) => IsHarmful(effect) || GetEffectBase(effect)?.Classification == StatusEffectBase.EffectClassification.Negative;

/// <summary>
/// Returns whether or not the provided <paramref name="effect"/> is a positive effect.
Expand Down Expand Up @@ -212,13 +212,13 @@ public static EffectCategory GetCategories(this EffectType effect)
{
EffectCategory category = EffectCategory.None;
if (effect.IsPositive())
category.AddFlags(EffectCategory.Positive);
category = category.AddFlags(EffectCategory.Positive);
if (effect.IsNegative())
category.AddFlags(EffectCategory.Negative);
category = category.AddFlags(EffectCategory.Negative);
if (effect.IsMovement())
category.AddFlags(EffectCategory.Movement);
category = category.AddFlags(EffectCategory.Movement);
if (effect.IsHarmful())
category.AddFlags(EffectCategory.Harmful);
category = category.AddFlags(EffectCategory.Harmful);

return category;
}
Expand Down
2 changes: 1 addition & 1 deletion Exiled.API/Features/Items/Firearm.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ internal Firearm(ItemType type)
{
FirearmStatusFlags firearmStatusFlags = FirearmStatusFlags.MagazineInserted;
if (Base.HasAdvantageFlag(AttachmentDescriptiveAdvantages.Flashlight))
firearmStatusFlags.AddFlags(FirearmStatusFlags.FlashlightEnabled);
firearmStatusFlags = firearmStatusFlags.AddFlags(FirearmStatusFlags.FlashlightEnabled);

Base.Status = new(MaxAmmo, firearmStatusFlags, Base.GetCurrentAttachmentsCode());
}
Expand Down
2 changes: 1 addition & 1 deletion Exiled.API/Features/Player.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2895,7 +2895,7 @@ public Item AddItem(FirearmType firearmType, IEnumerable<AttachmentIdentifier> i
FirearmStatusFlags flags = FirearmStatusFlags.MagazineInserted;

if (firearm.Attachments.Any(a => a.Name == AttachmentName.Flashlight))
flags.AddFlags(FirearmStatusFlags.FlashlightEnabled);
flags = flags.AddFlags(FirearmStatusFlags.FlashlightEnabled);

firearm.Base.Status = new FirearmStatus(firearm.MaxAmmo, flags, firearm.Base.GetCurrentAttachmentsCode());
}
Expand Down
Loading