Skip to content

Fix DisposalUnit deletes enitites that climbing inside in special timing #43686

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
M4rchy-S wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −1
Open

Fix DisposalUnit deletes enitites that climbing inside in special timing #43686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Content.Server/Disposal/Unit/DisposalUnitSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ protected override void HandleAir(EntityUid uid, DisposalUnitComponent component

private void OnDestruction(EntityUid uid, DisposalUnitComponent component, DestructionEventArgs args)
{
component.IsDestroyed = true;
TryEjectContents(uid, component);
}

Expand Down
5 changes: 5 additions & 0 deletions Content.Shared/Disposal/Unit/DisposalUnitComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,11 @@ public sealed partial class DisposalUnitComponent : Component
[DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoNetworkedField]
public TimeSpan? NextFlush;

/// <summary>
/// Destroyed flag for escaping race conditions
/// </summary>
public bool IsDestroyed = false;

[Serializable, NetSerializable]
public enum Visuals : byte
{
Expand Down
2 changes: 1 addition & 1 deletion Content.Shared/Disposal/Unit/SharedDisposalUnitSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ private void AddInsertVerb(EntityUid uid, DisposalUnitComponent component, GetVe

private void OnDoAfter(EntityUid uid, DisposalUnitComponent component, DoAfterEvent args)
{
if (args.Handled || args.Cancelled || args.Args.Target == null || args.Args.Used == null)
if (args.Handled || args.Cancelled || args.Args.Target == null || args.Args.Used == null || component.IsDestroyed)
Copy link
Copy Markdown
Member

@Tayrtahn Tayrtahn Apr 22, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would TerminatingOrDeleted work instead?

Copy link
Copy Markdown
Contributor Author

@M4rchy-S M4rchy-S Apr 22, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I checked TerminatingOrDeleted and it does not work.

return;

AfterInsert(uid, component, args.Args.Target.Value, args.Args.User, doInsert: true);
Expand Down
Loading