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

Makes many things use OwnerUid instead of Owner.Uid

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-11-09 14:45:14 +01:00
parent af579b15cc
commit b6337ffe7a
20 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Shared/Damage/DamageableComponent.cs
View File

@@ -92,7 +92,7 @@ namespace Content.Shared.Damage
damage.DamageDict.Add(typeID, damageValue);
}
EntitySystem.Get<DamageableSystem>().TryChangeDamage(Owner.Uid, damage);
EntitySystem.Get<DamageableSystem>().TryChangeDamage(OwnerUid, damage);
}
// TODO EXPLOSION Remove this.
@@ -113,7 +113,7 @@ namespace Content.Shared.Damage
damage.DamageDict.Add(typeID, damageValue);
}
EntitySystem.Get<DamageableSystem>().TryChangeDamage(Owner.Uid, damage);
EntitySystem.Get<DamageableSystem>().TryChangeDamage(OwnerUid, damage);
}
}

4
Content.Shared/Damage/DamageableSystem.cs
View File

@@ -85,9 +85,9 @@ namespace Content.Shared.Damage
component.TotalDamage = component.Damage.Total;
component.Dirty();
if (EntityManager.TryGetComponent<SharedAppearanceComponent>(component.Owner.Uid, out var appearance) && damageDelta != null)
if (EntityManager.TryGetComponent<SharedAppearanceComponent>(component.OwnerUid, out var appearance) && damageDelta != null)
appearance.SetData(DamageVisualizerKeys.DamageUpdateGroups, damageDelta.GetDamagePerGroup().Keys.ToList());
RaiseLocalEvent(component.Owner.Uid, new DamageChangedEvent(component, damageDelta), false);
RaiseLocalEvent(component.OwnerUid, new DamageChangedEvent(component, damageDelta), false);
}
/// <summary>