Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

DamageSpecifier Total => GetTotal (#24160)

Browse Source 
* DamageSpecifier [Obsolete] Total => GetTotal()

* Remove obsolete Total member from DamageSpecifier.
This commit is contained in:
LordCarve
2024-01-22 02:59:14 +01:00
committed by GitHub
parent 0fbc815db6
commit c77eb8691d
19 changed files with 32 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Damage/ForceSay/DamageForceSaySystem.cs
View File

@@ -1,4 +1,4 @@
using Content.Shared.Damage;
using Content.Shared.Damage;
using Content.Shared.Damage.ForceSay;
using Content.Shared.FixedPoint;
using Content.Shared.Mobs;
@@ -90,7 +90,7 @@ public sealed class DamageForceSaySystem : EntitySystem
private void OnDamageChanged(EntityUid uid, DamageForceSayComponent component, DamageChangedEvent args)
{
if (args.DamageDelta == null || !args.DamageIncreased || args.DamageDelta.Total < component.DamageThreshold)
if (args.DamageDelta == null || !args.DamageIncreased || args.DamageDelta.GetTotal() < component.DamageThreshold)
return;
if (component.ValidDamageGroups != null)

2
Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
View File

@@ -36,7 +36,7 @@ namespace Content.Server.Damage.Systems
// Log damage only for mobs. Useful for when people throw spears at each other, but also avoids log-spam when explosions send glass shards flying.
if (dmg != null && HasComp<MobStateComponent>(args.Target))
_adminLogger.Add(LogType.ThrowHit, $"{ToPrettyString(args.Target):target} received {dmg.Total:damage} damage from collision");
_adminLogger.Add(LogType.ThrowHit, $"{ToPrettyString(args.Target):target} received {dmg.GetTotal():damage} damage from collision");
if (dmg is { Empty: false })
{

2
Content.Server/Damage/Systems/DamagePopupSystem.cs
View File

@@ -20,7 +20,7 @@ public sealed class DamagePopupSystem : EntitySystem
if (args.DamageDelta != null)
{
var damageTotal = args.Damageable.TotalDamage;
var damageDelta = args.DamageDelta.Total;
var damageDelta = args.DamageDelta.GetTotal();
var msg = component.Type switch
{