space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-15 03:30:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Inline MetaData

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 11:12:35 +01:00
parent f782e76671
commit 6e86f98406
3 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using Prometheus;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Prototypes;
using Robust.Shared.Timing;
@@ -295,7 +296,7 @@ namespace Robust.Shared.GameObjects
var uid = entity.Uid;
var transform = entity.Transform;
var metadata = entity.MetaData;
var metadata = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity.Uid);
entity.LifeStage = EntityLifeStage.Terminating;
EventBus.RaiseLocalEvent(entity.Uid, new EntityTerminatingEvent(), false);

23
Robust.Shared/GameObjects/IEntity.cs
View File

@@ -21,33 +21,33 @@ namespace Robust.Shared.GameObjects
public EntityLifeStage LifeStage
{
get => !IoCManager.Resolve<IEntityManager>().EntityExists(Uid) ? EntityLifeStage.Deleted : MetaData.EntityLifeStage;
internal set => MetaData.EntityLifeStage = value;
get => !IoCManager.Resolve<IEntityManager>().EntityExists(Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Uid).EntityLifeStage;
internal set => IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Uid).EntityLifeStage = value;
}
[ViewVariables]
public GameTick LastModifiedTick { get => MetaData.EntityLastModifiedTick; internal set => MetaData.EntityLastModifiedTick = value; }
public GameTick LastModifiedTick { get => IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Uid).EntityLastModifiedTick; internal set => IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Uid).EntityLastModifiedTick = value; }
[ViewVariables]
public EntityPrototype? Prototype
{
get => MetaData.EntityPrototype;
internal set => MetaData.EntityPrototype = value;
get => IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Uid).EntityPrototype;
internal set => IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Uid).EntityPrototype = value;
}
[ViewVariables(VVAccess.ReadWrite)]
public string Description
{
get => MetaData.EntityDescription;
set => MetaData.EntityDescription = value;
get => IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Uid).EntityDescription;
set => IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Uid).EntityDescription = value;
}
[ViewVariables(VVAccess.ReadWrite)]
public string Name
{
get => MetaData.EntityName;
set => MetaData.EntityName = value;
get => IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Uid).EntityName;
set => IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Uid).EntityName = value;
}
public bool Initialized => LifeStage >= EntityLifeStage.Initialized;
@@ -57,14 +57,11 @@ namespace Robust.Shared.GameObjects
public bool Deleted => LifeStage >= EntityLifeStage.Deleted;
[ViewVariables]
public bool Paused { get => Deleted || MetaData.EntityPaused; set => MetaData.EntityPaused = value; }
public bool Paused { get => Deleted || IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Uid).EntityPaused; set => IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Uid).EntityPaused = value; }
[ViewVariables]
public TransformComponent Transform => IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Uid);
[ViewVariables]
public MetaDataComponent MetaData => IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Uid);
#endregion Members
#region Initialization

2
Robust.Shared/Prototypes/EntityPrototype.cs
View File

@@ -226,7 +226,7 @@ namespace Robust.Shared.Prototypes
}
// Update entity metadata
entity.MetaData.EntityPrototype = this;
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity.Uid).EntityPrototype = this;
}
internal static void LoadEntity(EntityPrototype? prototype, IEntity entity, IComponentFactory factory,