Make EntityRenamedEvent contain Entity info and previous name. Make i…

…t broadcast when raised.
nikthechampiongr · Aug 30, 2024 · 25d3727 · 25d3727
1 parent 2178707
commit 25d3727
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Robust.Shared/GameObjects/EntitySystemMessages/EntityRenamedEvent.cs b/Robust.Shared/GameObjects/EntitySystemMessages/EntityRenamedEvent.cs
@@ -2,6 +2,7 @@ namespace Robust.Shared.GameObjects;
 
 /// <summary>
 /// Raised directed on an entity when its name is changed.
+/// Contains the EntityUid as systems may need to subscribe to it without targeting a specific component.
 /// </summary>
 [ByRefEvent]
-public readonly record struct EntityRenamedEvent(string NewName);
+public readonly record struct EntityRenamedEvent(EntityUid Uid, string OldName, string NewName);
diff --git a/Robust.Shared/GameObjects/Systems/MetaDataSystem.cs b/Robust.Shared/GameObjects/Systems/MetaDataSystem.cs
@@ -47,12 +47,14 @@ public void SetEntityName(EntityUid uid, string value, MetaDataComponent? metada
         if (!_metaQuery.Resolve(uid, ref metadata) || value.Equals(metadata.EntityName))
             return;
 
+        var oldName = metadata.EntityName;
+
         metadata._entityName = value;
 
         if (raiseEvents)
         {
-            var ev = new EntityRenamedEvent(value);
-            RaiseLocalEvent(uid, ref ev);
+            var ev = new EntityRenamedEvent(uid, oldName, value);
+            RaiseLocalEvent(uid, ref ev, true);
         }
 
         Dirty(uid, metadata, metadata);