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

A bunch more resolves removed wooo

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-08 11:37:11 +01:00
parent 52b09cef71
commit db996b9fb3
23 changed files with 116 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -178,7 +178,8 @@ namespace Robust.Shared.Prototypes
public void UpdateEntity(EntityUid entity)
{
var entityManager = IoCManager.Resolve<IEntityManager>();
if (ID != entityManager.GetComponent<MetaDataComponent>(entity).EntityPrototype?.ID)
var metaData = entityManager.GetComponent<MetaDataComponent>(entity);
if (ID != metaData.EntityPrototype?.ID)
{
Logger.Error(
$"Reloaded prototype used to update entity did not match entity's existing prototype: Expected '{ID}', got '{entityManager.GetComponent<MetaDataComponent>(entity).EntityPrototype?.ID}'");
@@ -186,7 +187,7 @@ namespace Robust.Shared.Prototypes
}
var factory = IoCManager.Resolve<IComponentFactory>();
var oldPrototype = entityManager.GetComponent<MetaDataComponent>(entity).EntityPrototype;
var oldPrototype = metaData.EntityPrototype;
var oldPrototypeComponents = oldPrototype?.Components.Keys
.Where(n => n != "Transform" && n != "MetaData")
@@ -227,7 +228,7 @@ namespace Robust.Shared.Prototypes
}
// Update entity metadata
entityManager.GetComponent<MetaDataComponent>(entity).EntityPrototype = this;
metaData.EntityPrototype = this;
}
internal static void LoadEntity(EntityPrototype? prototype, EntityUid entity, IComponentFactory factory,