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

Fix SpillTileReaction errors (#10910)

Browse Source 
* Fix SpillTileReaction errors

* namespace
This commit is contained in:
Leon Friedrich
2022-08-30 14:36:46 +12:00
committed by GitHub
parent 9fff279cb9
commit 9813aeb724
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Server/Chemistry/TileReactions/SpillTileReaction.cs
View File

@@ -1,10 +1,11 @@
using Content.Server.Fluids.EntitySystems; using Content.Server.Fluids.EntitySystems;
using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.Components;
using Content.Shared.Chemistry.Reaction; using Content.Shared.Chemistry.Reaction;
using Content.Shared.Chemistry.Reagent; using Content.Shared.Chemistry.Reagent;
using Content.Shared.FixedPoint; using Content.Shared.FixedPoint;
using Content.Shared.Slippery; using Content.Shared.Slippery;
using Content.Shared.StepTrigger; using Content.Shared.StepTrigger;
using Content.Shared.StepTrigger.Components;
using Content.Shared.StepTrigger.Systems; using Content.Shared.StepTrigger.Systems;
using JetBrains.Annotations; using JetBrains.Annotations;
using Robust.Shared.Map; using Robust.Shared.Map;
@@ -24,18 +25,21 @@ namespace Content.Server.Chemistry.TileReactions
{ {
if (reactVolume < 5) return FixedPoint2.Zero; if (reactVolume < 5) return FixedPoint2.Zero;
var entityManager = IoCManager.Resolve<IEntityManager>();
// TODO Make this not puddle smear. // TODO Make this not puddle smear.
var puddle = EntitySystem.Get<SpillableSystem>() var puddle = entityManager.EntitySysManager.GetEntitySystem<SpillableSystem>()
.SpillAt(tile, new Solution(reagent.ID, reactVolume), "PuddleSmear", _overflow, false, true); .SpillAt(tile, new Solution(reagent.ID, reactVolume), "PuddleSmear", _overflow, false, true);
if (puddle != null) if (puddle != null)
{ {
var entityManager = IoCManager.Resolve<IEntityManager>(); var slippery = entityManager.EnsureComponent<SlipperyComponent>(puddle.Owner);
var slippery = entityManager.GetComponent<SlipperyComponent>(puddle.Owner);
slippery.LaunchForwardsMultiplier = _launchForwardsMultiplier; slippery.LaunchForwardsMultiplier = _launchForwardsMultiplier;
EntitySystem.Get<StepTriggerSystem>().SetRequiredTriggerSpeed(puddle.Owner, _requiredSlipSpeed);
slippery.ParalyzeTime = _paralyzeTime; slippery.ParalyzeTime = _paralyzeTime;
var step = entityManager.EnsureComponent<StepTriggerComponent>(puddle.Owner);
entityManager.EntitySysManager.GetEntitySystem<StepTriggerSystem>().SetRequiredTriggerSpeed(puddle.Owner, _requiredSlipSpeed, step);
return reactVolume; return reactVolume;
} }