Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 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/Body/Behavior/StomachBehavior.cs
View File

@@ -89,7 +89,7 @@ namespace Content.Server.Body.Behavior
{
get
{
EntitySystem.Get<SolutionContainerSystem>().TryGetSolution(Owner, DefaultSolutionName, out var solution);
EntitySystem.Get<SolutionContainerSystem>().TryGetSolution(Owner.Uid, DefaultSolutionName, out var solution);
return solution;
}
}
@@ -134,7 +134,7 @@ namespace Content.Server.Body.Behavior
{
base.Startup();
var solution = EntitySystem.Get<SolutionContainerSystem>().EnsureSolution(Owner, DefaultSolutionName);
var solution = EntitySystem.Get<SolutionContainerSystem>().EnsureSolution(Owner.Uid, DefaultSolutionName);
solution.MaxVolume = InitialMaxVolume;
}

2
Content.Server/Body/Circulatory/BloodstreamComponent.cs
View File

@@ -44,7 +44,7 @@ namespace Content.Server.Body.Circulatory
{
base.Initialize();
_internalSolution = EntitySystem.Get<SolutionContainerSystem>().EnsureSolution(Owner, DefaultSolutionName);
_internalSolution = EntitySystem.Get<SolutionContainerSystem>().EnsureSolution(Owner.Uid, DefaultSolutionName);
if (_internalSolution != null)
{
_internalSolution.MaxVolume = _initialMaxVolume;

4
Content.Server/Body/Metabolism/MetabolizerSystem.cs
View File

@@ -28,7 +28,7 @@ namespace Content.Server.Body.Metabolism
private void OnMetabolizerInit(EntityUid uid, MetabolizerComponent component, ComponentInit args)
{
_solutionContainerSystem.EnsureSolution(EntityManager.GetEntity(uid), component.SolutionName);
_solutionContainerSystem.EnsureSolution(uid, component.SolutionName);
}
public override void Update(float frameTime)
@@ -63,7 +63,7 @@ namespace Content.Server.Body.Metabolism
if (body != null)
{
if (body.Owner.HasComponent<BloodstreamComponent>()
&& solutionsSys.TryGetSolution(body.Owner, comp.SolutionName, out solution)
&& solutionsSys.TryGetSolution(body.Owner.Uid, comp.SolutionName, out solution)
&& solution.CurrentVolume >= ReagentUnit.Zero)
{
reagentList = solution.Contents;