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

Fix dumping into disposals (#19736)

Browse Source
This commit is contained in:
faint
2023-09-02 07:02:35 +03:00
committed by GitHub
parent a6bed0f163
commit 0b9b4f6532
3 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
View File

@@ -1,3 +1,4 @@
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using Content.Server.Administration.Logs;
using Content.Server.Atmos.EntitySystems;
@@ -200,7 +201,7 @@ public sealed class DisposalUnitSystem : SharedDisposalUnitSystem
public override void DoInsertDisposalUnit(EntityUid uid, EntityUid toInsert, EntityUid user, SharedDisposalUnitComponent? disposal = null)
{
if (!Resolve(uid, ref disposal))
if (!ResolveDisposals(uid, ref disposal))
return;
if (!disposal.Container.Insert(toInsert))
@@ -737,6 +738,16 @@ public sealed class DisposalUnitSystem : SharedDisposalUnitSystem
return HasComp<DisposalUnitComponent>(uid);
}
public override bool ResolveDisposals(EntityUid uid, [NotNullWhen(true)] ref SharedDisposalUnitComponent? component)
{
if (component != null)
return true;
TryComp<DisposalUnitComponent>(uid, out var storage);
component = storage;
return component != null;
}
public override bool CanInsert(EntityUid uid, SharedDisposalUnitComponent component, EntityUid entity)
{
if (!base.CanInsert(uid, component, entity) || component is not SharedDisposalUnitComponent serverComp)