tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor Resolve and IEntity in SolutionContainerSystem (#5083)

Browse Source 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
Ygg01
2021-11-02 02:03:23 +01:00
committed by GitHub
parent a13e23528c
commit fc5fa67a56
30 changed files with 141 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Chemistry/Components/FoamSolutionAreaEffectComponent.cs
View File

@@ -23,7 +23,7 @@ namespace Content.Server.Chemistry.Components
protected override void UpdateVisuals()
{
if (Owner.TryGetComponent(out AppearanceComponent? appearance) &&
EntitySystem.Get<SolutionContainerSystem>().TryGetSolution(Owner, SolutionName, out var solution))
EntitySystem.Get<SolutionContainerSystem>().TryGetSolution(Owner.Uid, SolutionName, out var solution))
{
appearance.SetData(FoamVisuals.Color, solution.Color.WithAlpha(0.80f));
}
@@ -31,7 +31,7 @@ namespace Content.Server.Chemistry.Components
protected override void ReactWithEntity(IEntity entity, double solutionFraction)
{
if (!EntitySystem.Get<SolutionContainerSystem>().TryGetSolution(Owner, SolutionName, out var solution))
if (!EntitySystem.Get<SolutionContainerSystem>().TryGetSolution(Owner.Uid, SolutionName, out var solution))
return;
if (!entity.TryGetComponent(out BloodstreamComponent? bloodstream))