cmdrunematti
/
Delta-v
mirror of https://github.com/DeltaV-Station/Delta-v.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix dumping into disposals (#19736)

This commit is contained in:
faint 2023-09-02 07:02:35 +03:00 committed by GitHub
parent a6bed0f163
commit 0b9b4f6532
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Client/Disposal/Systems/DisposalUnitSystem.cs
View File

@ -1,3 +1,4 @@
using System.Diagnostics.CodeAnalysis;
using Content.Shared.Disposal;
using Content.Shared.Disposal.Components;
using Content.Shared.DragDrop;
@ -53,6 +54,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 void DoInsertDisposalUnit(EntityUid uid, EntityUid toInsert, EntityUid user, SharedDisposalUnitComponent? disposal = null)
{
return;

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)

3
Content.Shared/Disposal/SharedDisposalUnitSystem.cs
View File

@ -8,7 +8,6 @@ using Content.Shared.Item;
using Content.Shared.Mobs.Components;
using Content.Shared.Mobs.Systems;
using Content.Shared.Throwing;
using JetBrains.Annotations;
using Robust.Shared.Audio;
using Robust.Shared.Physics.Components;
using Robust.Shared.Physics.Events;
@ -37,6 +36,8 @@ public abstract class SharedDisposalUnitSystem : EntitySystem
public abstract bool HasDisposals([NotNullWhen(true)] EntityUid? uid);
public abstract bool ResolveDisposals(EntityUid uid, [NotNullWhen(true)] ref SharedDisposalUnitComponent? component);
/// <summary>
/// Gets the current pressure state of a disposals unit.
/// </summary>