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] CustomDamageHandler NRE Fix #2726

Merged
merged 8 commits into from
Jul 18, 2024
Merged

[Resonance] CustomDamageHandler NRE Fix #2726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1eb9e65
Fix NRE in CustomDamageHandler constructor
xNexusACS Jul 17, 2024
d5aaba3
use else keyword instead
xNexusACS Jul 17, 2024
ddf8c4b
revert
xNexusACS Jul 17, 2024
0c04557
Another NRE Fix
xNexusACS Jul 17, 2024
f6d6c0f
use trygetvalue here instead of ContainsKey
xNexusACS Jul 17, 2024
47523b7
Merge branch 'dev' into damagehandler-fix
xNexusACS Jul 17, 2024
600c08d
Merge branch 'dev' into damagehandler-fix
xNexusACS Jul 17, 2024
de70e67
Merge branch 'dev' into damagehandler-fix
xNexusACS Jul 18, 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
17 changes: 12 additions & 5 deletions Exiled.API/Features/DamageHandlers/CustomDamageHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public sealed class CustomDamageHandler : AttackerDamageHandler
public CustomDamageHandler(Player target, BaseHandler baseHandler)
: base(target, baseHandler)
{
if (Attacker)
if (Attacker is not null)
{
if (baseHandler is BaseScpDamageHandler)
CustomBase = new ScpDamageHandler(target, baseHandler);
Expand Down Expand Up @@ -95,12 +95,19 @@ public CustomDamageHandler(Player target, Player attacker, float damage, DamageT
Damage = damage;
Type = damageType;

Firearm firearm = new(ItemType.GunAK)
if (attacker is not null)
{
Base = { Owner = attacker.ReferenceHub },
};
Firearm firearm = new(ItemType.GunAK)
{
Base = { Owner = attacker.ReferenceHub },
};

CustomBase = new FirearmDamageHandler(firearm, target, new BaseFirearmHandler(firearm.Base, damage));
CustomBase = new FirearmDamageHandler(firearm, target, new BaseFirearmHandler(firearm.Base, damage));

return;
}

CustomBase = new DamageHandler(target, attacker: null);
}

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions Exiled.API/Features/DamageHandlers/DamageHandlerBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ public virtual DamageType Type
{
DeathTranslation translation = DeathTranslations.TranslationsById[handler.TranslationId];

if (DamageTypeExtensions.TranslationIdConversion.ContainsKey(translation.Id))
return damageType = DamageTypeExtensions.TranslationIdConversion[translation.Id];
if (DamageTypeExtensions.TranslationIdConversion.TryGetValue(translation.Id, out DamageType value))
return damageType = value;

Log.Warn($"{nameof(DamageHandler)}.{nameof(Type)}:" +
$"No matching {nameof(DamageType)} for {nameof(UniversalDamageHandler)} with ID {translation.Id}, type will be reported as {DamageType.Unknown}." +
Expand Down
Loading