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

Fix crash related to reagent reactions

Browse Source
This commit is contained in:
Víctor Aguilera Puerto
2020-10-21 23:08:31 +02:00
parent 1f56b5db0b
commit e98abd923c
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs
View File

@@ -188,7 +188,7 @@ namespace Content.Server.GameObjects.Components.Nutrition
foreach (var (reagentId, quantity) in split.Contents) foreach (var (reagentId, quantity) in split.Contents)
{ {
if (!_prototypeManager.TryIndex(reagentId, out ReagentPrototype reagent)) continue; if (!_prototypeManager.TryIndex(reagentId, out ReagentPrototype reagent)) continue;
split.RemoveReagent(reagentId, reagent.ReactionEntity(target, ReactionMethod.Ingestion, quantity)); split.RemoveReagent(reagentId, reagent.ReactionEntity(trueTarget, ReactionMethod.Ingestion, quantity));
} }
firstStomach.TryTransferSolution(split); firstStomach.TryTransferSolution(split);

3
Content.Shared/Chemistry/ReagentPrototype.cs
View File

@@ -88,6 +88,9 @@ namespace Content.Shared.Chemistry
{ {
var removed = ReagentUnit.Zero; var removed = ReagentUnit.Zero;
if (entity == null || entity.Deleted)
return removed;
foreach (var react in entity.GetAllComponents<IReagentReaction>()) foreach (var react in entity.GetAllComponents<IReagentReaction>())
{ {
switch (method) switch (method)