Skip to content

fix: Hurt and Hurting Attacker property fix #640

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 1 commit into from
Sep 7, 2025
Merged

fix: Hurt and Hurting Attacker property fix #640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion EXILED/Exiled.Events/EventArgs/Player/HurtEventArgs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,14 @@ public HurtEventArgs(ReferenceHub referenceHub, DamageHandlerBase damageHandler,
{
Player = Player.Get(referenceHub);
DamageHandler = new CustomDamageHandler(Player, damageHandler);
Attacker = DamageHandler.BaseIs(out CustomAttackerHandler attackerDamageHandler) ? attackerDamageHandler.Attacker : null;
HandlerOutput = handlerOutput;

if (DamageHandler.BaseIs(out CustomAttackerHandler attackerDamageHandler))
Attacker = attackerDamageHandler.Attacker;
else if (damageHandler is GenericDamageHandler genericDamageHandler)
Attacker = Player.Get(genericDamageHandler.Attacker);
else
Attacker = null;
}

/// <inheritdoc/>
Expand Down
8 changes: 7 additions & 1 deletion EXILED/Exiled.Events/EventArgs/Player/HurtingEventArgs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,14 @@ public HurtingEventArgs(Player target, DamageHandlerBase damageHandler)
{
DamageHandler = new CustomDamageHandler(target, damageHandler);

Attacker = DamageHandler.BaseIs(out CustomAttackerHandler attackerDamageHandler) ? attackerDamageHandler.Attacker : null;
Player = target;

if (DamageHandler.BaseIs(out CustomAttackerHandler attackerDamageHandler))
Attacker = attackerDamageHandler.Attacker;
else if (damageHandler is GenericDamageHandler genericDamageHandler)
Attacker = Player.Get(genericDamageHandler.Attacker);
else
Attacker = null;
}

/// <inheritdoc/>
Expand Down
Loading