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

ReagentEntityReaction uses EntityUid

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-11-09 11:12:55 +01:00
parent 40c3261665
commit 0220551f72
6 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Shared/Chemistry/ChemistrySystem.cs
View File

@@ -37,7 +37,7 @@ namespace Content.Shared.Chemistry
foreach (var reaction in reactive.Reactions)
{
// If we have a source solution, use the reagent quantity we have left. Otherwise, use the reaction volume specified.
reaction.React(method, entity, reagent, source?.GetReagentQuantity(reagent.ID) ?? reactVolume, source);
reaction.React(method, entity.Uid, reagent, source?.GetReagentQuantity(reagent.ID) ?? reactVolume, source, EntityManager);
// Make sure we still have enough reagent to go...
if (source != null && !source.ContainsReagent(reagent.ID))

6
Content.Shared/Chemistry/Reagent/ReagentEntityReaction.cs
View File

@@ -28,7 +28,7 @@ namespace Content.Shared.Chemistry.Reagent
[DataField("ingestion")]
public bool Ingestion { get; } = false;
public void React(ReactionMethod method, IEntity entity, ReagentPrototype reagent, FixedPoint2 volume, Components.Solution? source)
public void React(ReactionMethod method, EntityUid uid, ReagentPrototype reagent, FixedPoint2 volume, Components.Solution? source, IEntityManager entityManager)
{
switch (method)
{
@@ -48,9 +48,9 @@ namespace Content.Shared.Chemistry.Reagent
throw new ArgumentOutOfRangeException(nameof(method), method, null);
}
React(entity, reagent, volume, source);
React(uid, reagent, volume, source, entityManager);
}
protected abstract void React(IEntity entity, ReagentPrototype reagent, FixedPoint2 volume, Components.Solution? source);
protected abstract void React(EntityUid uid, ReagentPrototype reagent, FixedPoint2 volume, Components.Solution? source, IEntityManager entityManager);
}
}