Skip to content

fix: custom weapons not doing default damage when set to below 0 #518

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

Merged
louis1706 merged 2 commits into from
Apr 29, 2025
Merged

fix: custom weapons not doing default damage when set to below 0 #518

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f67afe
fix custom weapons not doing default damage when set to below 0
TtroubleTT Apr 28, 2025
a88e634
make default damage -1
TtroubleTT Apr 29, 2025
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
4 changes: 2 additions & 2 deletions EXILED/Exiled.CustomItems/API/Features/CustomWeapon.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public override ItemType Type
/// <summary>
/// Gets or sets the weapon damage.
/// </summary>
public virtual float Damage { get; set; } = float.NaN;
public virtual float Damage { get; set; } = -1;

/// <summary>
/// Gets or sets a value indicating how big of a clip the weapon will have.
Expand Down Expand Up @@ -205,7 +205,7 @@ protected virtual void OnShot(ShotEventArgs ev)
/// <param name="ev"><see cref="HurtingEventArgs"/>.</param>
protected virtual void OnHurting(HurtingEventArgs ev)
{
if (ev.IsAllowed && Damage != float.NaN)
if (ev.IsAllowed && Damage >= 0)
ev.Amount = Damage;
}

Expand Down
Loading