Skip to content

Server & shared containerSystem clean up #6564

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
TheShuEd wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Server & shared containerSystem clean up #6564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0dba66
clean up
TheShuEd May 12, 2026
3c55655
revert readonly
TheShuEd May 12, 2026
42865be
file scoped SharedContainerSystem
TheShuEd May 12, 2026
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
14 changes: 6 additions & 8 deletions Robust.Server/Containers/ContainerSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
using Robust.Shared.Containers;
using Robust.Shared.GameObjects;
using Robust.Shared.Log;

namespace Robust.Server.Containers
namespace Robust.Server.Containers;

public sealed class ContainerSystem : SharedContainerSystem
{
public sealed class ContainerSystem : SharedContainerSystem
protected override void ValidateMissingEntity(EntityUid uid, BaseContainer cont, EntityUid missing)
{
protected override void ValidateMissingEntity(EntityUid uid, BaseContainer cont, EntityUid missing)
{
Log.Error($"Missing entity for container {ToPrettyString(uid)}. Missing uid: {missing}");
//cont.InternalRemove(ent);
}
Log.Error($"Missing entity for container {ToPrettyString(uid)}. Missing uid: {missing}");
//cont.InternalRemove(ent);
}
}
2 changes: 0 additions & 2 deletions Robust.Shared/Containers/SharedContainerSystem.Validation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

namespace Robust.Shared.Containers;


// This partial class just exists for debug asserts and bug fixing
public abstract partial class SharedContainerSystem : EntitySystem
{
Expand Down Expand Up @@ -65,5 +64,4 @@ private void ValidateChildren(TransformComponent xform, EntityQuery<TransformCom
ValidateChildren(childXform, xformQuery, physicsQuery);
}
}

}
Loading
Loading