Fix remote solution injection (#23429)
Checks if its own fixture is hard so the fly-by fixture can't also proc it.
This commit is contained in:
@@ -1,18 +1,17 @@
|
|||||||
using Content.Shared.FixedPoint;
|
using Content.Shared.FixedPoint;
|
||||||
using Content.Shared.Inventory;
|
using Content.Shared.Inventory;
|
||||||
|
|
||||||
namespace Content.Server.Chemistry.Components
|
namespace Content.Server.Chemistry.Components;
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// On colliding with an entity that has a bloodstream will dump its solution onto them.
|
|
||||||
/// </summary>
|
|
||||||
[RegisterComponent]
|
|
||||||
internal sealed partial class SolutionInjectOnCollideComponent : Component
|
|
||||||
{
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// On colliding with an entity that has a bloodstream will dump its solution onto them.
|
||||||
|
/// </summary>
|
||||||
|
[RegisterComponent]
|
||||||
|
public sealed partial class SolutionInjectOnCollideComponent : Component
|
||||||
|
{
|
||||||
[ViewVariables(VVAccess.ReadWrite)]
|
[ViewVariables(VVAccess.ReadWrite)]
|
||||||
[DataField("transferAmount")]
|
[DataField("transferAmount")]
|
||||||
public FixedPoint2 TransferAmount { get; set; } = FixedPoint2.New(1);
|
public FixedPoint2 TransferAmount = FixedPoint2.New(1);
|
||||||
|
|
||||||
[ViewVariables(VVAccess.ReadWrite)]
|
[ViewVariables(VVAccess.ReadWrite)]
|
||||||
public float TransferEfficiency { get => _transferEfficiency; set => _transferEfficiency = Math.Clamp(value, 0, 1); }
|
public float TransferEfficiency { get => _transferEfficiency; set => _transferEfficiency = Math.Clamp(value, 0, 1); }
|
||||||
@@ -25,5 +24,4 @@ namespace Content.Server.Chemistry.Components
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
[DataField("blockSlots"), ViewVariables(VVAccess.ReadWrite)]
|
[DataField("blockSlots"), ViewVariables(VVAccess.ReadWrite)]
|
||||||
public SlotFlags BlockSlots = SlotFlags.MASK;
|
public SlotFlags BlockSlots = SlotFlags.MASK;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,11 +6,10 @@ using Content.Shared.Inventory;
|
|||||||
using JetBrains.Annotations;
|
using JetBrains.Annotations;
|
||||||
using Robust.Shared.Physics.Events;
|
using Robust.Shared.Physics.Events;
|
||||||
|
|
||||||
namespace Content.Server.Chemistry.EntitySystems
|
namespace Content.Server.Chemistry.EntitySystems;
|
||||||
|
|
||||||
|
public sealed class SolutionInjectOnCollideSystem : EntitySystem
|
||||||
{
|
{
|
||||||
[UsedImplicitly]
|
|
||||||
internal sealed class SolutionInjectOnCollideSystem : EntitySystem
|
|
||||||
{
|
|
||||||
[Dependency] private readonly SolutionContainerSystem _solutionContainersSystem = default!;
|
[Dependency] private readonly SolutionContainerSystem _solutionContainersSystem = default!;
|
||||||
[Dependency] private readonly BloodstreamSystem _bloodstreamSystem = default!;
|
[Dependency] private readonly BloodstreamSystem _bloodstreamSystem = default!;
|
||||||
[Dependency] private readonly InventorySystem _inventorySystem = default!;
|
[Dependency] private readonly InventorySystem _inventorySystem = default!;
|
||||||
@@ -27,6 +26,7 @@ namespace Content.Server.Chemistry.EntitySystems
|
|||||||
var target = args.OtherEntity;
|
var target = args.OtherEntity;
|
||||||
|
|
||||||
if (!args.OtherBody.Hard ||
|
if (!args.OtherBody.Hard ||
|
||||||
|
!args.OurBody.Hard ||
|
||||||
!EntityManager.TryGetComponent<BloodstreamComponent>(target, out var bloodstream) ||
|
!EntityManager.TryGetComponent<BloodstreamComponent>(target, out var bloodstream) ||
|
||||||
!_solutionContainersSystem.TryGetInjectableSolution(ent.Owner, out var solution, out _))
|
!_solutionContainersSystem.TryGetInjectableSolution(ent.Owner, out var solution, out _))
|
||||||
{
|
{
|
||||||
@@ -49,5 +49,4 @@ namespace Content.Server.Chemistry.EntitySystems
|
|||||||
|
|
||||||
_bloodstreamSystem.TryAddToChemicals(target, solToInject, bloodstream);
|
_bloodstreamSystem.TryAddToChemicals(target, solToInject, bloodstream);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user