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

Fix 3000 errors

Browse Source
This commit is contained in:
DrSmugleaf
2021-12-05 18:09:01 +01:00
parent 2bfec7ec62
commit 2a3b7d809d
569 changed files with 2979 additions and 3280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Client/Damage/DamageVisualizer.cs
View File

@@ -195,7 +195,7 @@ namespace Content.Client.Damage
public readonly string? Color;
}
public override void InitializeEntity(IEntity entity)
public override void InitializeEntity(EntityUid entity)
{
base.InitializeEntity(entity);
@@ -207,7 +207,7 @@ namespace Content.Client.Damage
InitializeVisualizer(entity, damageData);
}
private void VerifyVisualizerSetup(IEntity entity, DamageVisualizerDataComponent damageData)
private void VerifyVisualizerSetup(EntityUid entity, DamageVisualizerDataComponent damageData)
{
if (_thresholds.Count < 1)
{
@@ -289,7 +289,7 @@ namespace Content.Client.Damage
}
}
private void InitializeVisualizer(IEntity entity, DamageVisualizerDataComponent damageData)
private void InitializeVisualizer(EntityUid entity, DamageVisualizerDataComponent damageData)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out SpriteComponent? spriteComponent)
|| !IoCManager.Resolve<IEntityManager>().TryGetComponent<DamageableComponent?>(entity, out var damageComponent)
@@ -504,7 +504,8 @@ namespace Content.Client.Damage
public override void OnChangeData(AppearanceComponent component)
{
if (!component.Owner.TryGetComponent<DamageVisualizerDataComponent>(out var damageData))
var entities = IoCManager.Resolve<IEntityManager>();
if (!entities.TryGetComponent(component.Owner, out DamageVisualizerDataComponent damageData))
return;
if (!damageData.Valid)
@@ -525,8 +526,9 @@ namespace Content.Client.Damage
private void HandleDamage(AppearanceComponent component, DamageVisualizerDataComponent damageData)
{
if (!component.Owner.TryGetComponent<SpriteComponent>(out var spriteComponent)
|| !component.Owner.TryGetComponent<DamageableComponent>(out var damageComponent))
var entities = IoCManager.Resolve<IEntityManager>();
if (!entities.TryGetComponent(component.Owner, out SpriteComponent spriteComponent)
|| !entities.TryGetComponent(component.Owner, out DamageableComponent damageComponent))
return;
if (_targetLayers != null && _damageOverlayGroups != null)