Skip to content

Prevent a potential EnsureComp exception. #6405

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

Merged
Tayrtahn merged 2 commits into from
Jan 31, 2026
+8 −10
Merged

Prevent a potential EnsureComp exception. #6405

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c709d35
Fix potential EnsureComponent collision
Princess-Cheeseballs Jan 31, 2026
5f99100
Merge branch 'master' into ensure-comp-funny
PJB3005 Jan 31, 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
18 changes: 8 additions & 10 deletions Robust.Shared/GameObjects/EntityManager.Components.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@
if (!MetaQuery.Resolve(uid, ref metadata, false))
throw new ArgumentException($"Entity {uid} is not valid.", nameof(uid));

DebugTools.Assert(component.Owner == default);

Check warning on line 333 in Robust.Shared/GameObjects/EntityManager.Components.cs

View workflow job for this annotation

GitHub Actions / build (MacOS) 

'IComponent.Owner' is obsolete: 'Update your API to allow accessing Owner through other means'
component.Owner = uid;

AddComponentInternal(uid, component, compReg, overwrite, skipInit: false, metadata);
Expand Down Expand Up @@ -838,18 +838,16 @@
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public bool EnsureComponent<T>(ref Entity<T?> entity) where T : IComponent, new()
{
if (entity.Comp != null)
{
// Check for deferred component removal.
if (entity.Comp.LifeStage <= ComponentLifeStage.Running)
{
DebugTools.AssertOwner(entity, entity.Comp);
return true;
}
if (entity.Comp == null)
return EnsureComponent<T>(entity.Owner, out entity.Comp);

RemoveComponent(entity, entity.Comp);
}
DebugTools.AssertOwner(entity, entity.Comp);

// Check for deferred component removal.
if (entity.Comp.LifeStage <= ComponentLifeStage.Running)
return true;

RemoveComponent(entity, entity.Comp);
entity.Comp = AddComponent<T>(entity);
return false;
}
Expand Down
Loading