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

MeleeChemicalInjectorComponent fix (#3449)

Browse Source
This commit is contained in:
collinlunn
2021-02-28 03:59:47 -07:00
committed by GitHub
parent 81f807b26b
commit d603a5e4de
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/GameObjects/Components/Weapon/Melee/MeleeChemicalInjectorComponent.cs
View File

@@ -1,4 +1,5 @@
using Content.Server.GameObjects.Components.Body.Circulatory; #nullable enable
using Content.Server.GameObjects.Components.Body.Circulatory;
using Content.Server.GameObjects.Components.Chemistry; using Content.Server.GameObjects.Components.Chemistry;
using Content.Shared.Chemistry; using Content.Shared.Chemistry;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
@@ -29,7 +30,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
serializer.DataField(ref _transferEfficiency, "transferEfficiency", 1f); serializer.DataField(ref _transferEfficiency, "transferEfficiency", 1f);
} }
public override void HandleMessage(ComponentMessage message, IComponent component) public override void HandleMessage(ComponentMessage message, IComponent? component)
{ {
base.HandleMessage(message, component); base.HandleMessage(message, component);
switch (message) switch (message)
@@ -48,6 +49,9 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
var hitBloodstreams = new List<BloodstreamComponent>(); var hitBloodstreams = new List<BloodstreamComponent>();
foreach (var entity in hitEntities) foreach (var entity in hitEntities)
{ {
if (entity.Deleted)
continue;
if (entity.TryGetComponent<BloodstreamComponent>(out var bloodstream)) if (entity.TryGetComponent<BloodstreamComponent>(out var bloodstream))
hitBloodstreams.Add(bloodstream); hitBloodstreams.Add(bloodstream);
} }