Fix new /turf(loc) not updating name and desc (OpenDreamProject#1559)

Hinaichigo · Dec 21, 2023 · a3dcd59 · a3dcd59
1 parent b6375da
commit a3dcd59
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/OpenDreamRuntime/AtomManager.cs b/OpenDreamRuntime/AtomManager.cs
@@ -192,13 +192,6 @@ public EntityUid CreateMovableEntity(DreamObjectMovable movable) {
         DMISpriteComponent sprite = _entityManager.AddComponent<DMISpriteComponent>(entity);
         sprite.SetAppearance(GetAppearanceFromDefinition(movable.ObjectDefinition));
 
-        if (_entityManager.TryGetComponent(entity, out MetaDataComponent? metaData)) {
-            _metaDataSystem ??= _entitySystemManager.GetEntitySystem<MetaDataSystem>();
-
-            _metaDataSystem.SetEntityName(entity, movable.GetDisplayName(), metaData);
-            _metaDataSystem.SetEntityDescription(entity, movable.Desc ?? string.Empty, metaData);
-        }
-
         _entityToAtom.Add(entity, movable);
         return entity;
     }

diff --git a/OpenDreamRuntime/Objects/DreamObjectTree.cs b/OpenDreamRuntime/Objects/DreamObjectTree.cs
@@ -76,6 +76,7 @@ public void LoadJson(DreamCompiledJson json) {
         _entitySystemManager.TryGetEntitySystem(out _appearanceSystem);
         _entitySystemManager.TryGetEntitySystem(out _transformSystem);
         _entitySystemManager.TryGetEntitySystem(out _pvsOverrideSystem);
+        _entitySystemManager.TryGetEntitySystem(out _metaDataSystem);
 
         Strings = json.Strings ?? new();
 

diff --git a/OpenDreamRuntime/Objects/Types/DreamObjectAtom.cs b/OpenDreamRuntime/Objects/Types/DreamObjectAtom.cs
@@ -1,4 +1,5 @@
-using OpenDreamShared.Dream;
+using OpenDreamRuntime.Procs;
+using OpenDreamShared.Dream;
 
 namespace OpenDreamRuntime.Objects.Types;
 
@@ -14,9 +15,6 @@ public class DreamObjectAtom : DreamObject {
     public DreamList? VisLocs; // TODO: Implement
 
     public DreamObjectAtom(DreamObjectDefinition objectDefinition) : base(objectDefinition) {
-        ObjectDefinition.Variables["name"].TryGetValueAsString(out Name);
-        ObjectDefinition.Variables["desc"].TryGetValueAsString(out Desc);
-
         Overlays = new(ObjectTree.List.ObjectDefinition, this, AppearanceSystem, false);
         Underlays = new(ObjectTree.List.ObjectDefinition, this, AppearanceSystem, true);
         VisContents = new(ObjectTree.List.ObjectDefinition, PvsOverrideSystem, this);
@@ -26,6 +24,11 @@ public DreamObjectAtom(DreamObjectDefinition objectDefinition) : base(objectDefi
         AtomManager.AddAtom(this);
     }
 
+    public override void Initialize(DreamProcArguments args) {
+        ObjectDefinition.Variables["name"].TryGetValueAsString(out Name);
+        ObjectDefinition.Variables["desc"].TryGetValueAsString(out Desc);
+    }
+
     protected override void HandleDeletion() {
         AtomManager.RemoveAtom(this);
 

diff --git a/OpenDreamRuntime/Objects/Types/DreamObjectMovable.cs b/OpenDreamRuntime/Objects/Types/DreamObjectMovable.cs
@@ -2,7 +2,6 @@
 using OpenDreamRuntime.Rendering;
 using OpenDreamShared.Dream;
 using Robust.Shared.Map;
-using Robust.Shared.Utility;
 
 namespace OpenDreamRuntime.Objects.Types;
 
@@ -40,14 +39,19 @@ public DreamObjectMovable(DreamObjectDefinition objectDefinition) : base(objectD
         Entity = AtomManager.CreateMovableEntity(this);
         SpriteComponent = EntityManager.GetComponent<DMISpriteComponent>(Entity);
         _transformComponent = EntityManager.GetComponent<TransformComponent>(Entity);
-
-        objectDefinition.Variables["screen_loc"].TryGetValueAsString(out var screenLoc);
-        ScreenLoc = screenLoc;
     }
 
     public override void Initialize(DreamProcArguments args) {
         base.Initialize(args);
 
+        ObjectDefinition.Variables["screen_loc"].TryGetValueAsString(out var screenLoc);
+        ScreenLoc = screenLoc;
+
+        if (EntityManager.TryGetComponent(Entity, out MetaDataComponent? metaData)) {
+            MetaDataSystem?.SetEntityName(Entity, GetDisplayName(), metaData);
+            MetaDataSystem?.SetEntityDescription(Entity, Desc ?? string.Empty, metaData);
+        }
+
         args.GetArgument(0).TryGetValueAsDreamObject<DreamObjectAtom>(out var loc);
         SetLoc(loc); //loc is set before /New() is ever called
     }