space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-14 19:29:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add new Dirty() override for Component.Owner removal (#4144)

Browse Source
This commit is contained in:
Leon Friedrich
2023-06-18 05:19:40 +12:00
committed by GitHub
parent 3bd7309536
commit a9eafd4025
4 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Robust.Client/GameObjects/ClientEntityManager.cs
View File

@@ -81,11 +81,11 @@ namespace Robust.Client.GameObjects
}
/// <inheritdoc />
public override void Dirty(Component component, MetaDataComponent? meta = null)
public override void Dirty(EntityUid uid, Component component, MetaDataComponent? meta = null)
{
// Client only dirties during prediction
if (_gameTiming.InPrediction)
base.Dirty(component, meta);
base.Dirty(uid, component, meta);
}
public override EntityStringRepresentation ToPrettyString(EntityUid uid)

19
Robust.Shared/GameObjects/EntityManager.cs
View File

@@ -404,21 +404,18 @@ namespace Robust.Shared.GameObjects
}
}
public virtual void Dirty(Component component, MetaDataComponent? meta = null)
[Obsolete("use override with an EntityUid")]
public void Dirty(Component component, MetaDataComponent? meta = null)
{
#pragma warning disable CS0618
var owner = component.Owner;
#pragma warning restore CS0618
Dirty(component.Owner, component, meta);
}
// Deserialization will cause this to be true.
// ReSharper disable once ConditionIsAlwaysTrueOrFalse
if (!owner.IsValid() || component.LifeStage >= ComponentLifeStage.Removing)
public virtual void Dirty(EntityUid uid, Component component, MetaDataComponent? meta = null)
{
if (component.LifeStage >= ComponentLifeStage.Removing || !component.NetSyncEnabled)
return;
if (!component.NetSyncEnabled)
return;
DirtyEntity(owner, meta);
DirtyEntity(uid, meta);
component.LastModifiedTick = CurrentTick;
}

9
Robust.Shared/GameObjects/EntitySystem.Proxy.cs
View File

@@ -200,6 +200,15 @@ public partial class EntitySystem
EntityManager.Dirty(component, meta);
}
/// <summary>
/// Marks a component as dirty. This also implicitly dirties the entity this component belongs to.
/// </summary>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
protected void Dirty(EntityUid uid, Component component, MetaDataComponent? meta = null)
{
EntityManager.Dirty(uid, component, meta);
}
/// <summary>
/// Retrieves the name of an entity.
/// </summary>

2
Robust.Shared/GameObjects/IEntityManager.cs
View File

@@ -102,6 +102,8 @@ namespace Robust.Shared.GameObjects
public void Dirty(Component component, MetaDataComponent? metadata = null);
public void Dirty(EntityUid uid, Component component, MetaDataComponent? meta = null);
public void QueueDeleteEntity(EntityUid uid);
public bool IsQueuedForDeletion(EntityUid uid);