]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Add Missing ExamineEntry attribute (#14965)
authorLeon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Wed, 29 Mar 2023 22:36:20 +0000 (11:36 +1300)
committerGitHub <noreply@github.com>
Wed, 29 Mar 2023 22:36:20 +0000 (17:36 -0500)
Content.Shared/Examine/GroupExamineComponent.cs

index 91be372bee0e8ce6fcc676d089150d744b79fd72..0bd260102f6fe4e1c46a72e51b30906f234c129d 100644 (file)
@@ -73,14 +73,14 @@ namespace Content.Shared.Examine
     /// <summary>
     ///     An entry used when showing examine details
     /// </summary>
-    [Serializable, NetSerializable]
+    [Serializable, NetSerializable, DataDefinition]
     public sealed class ExamineEntry
     {
         /// <summary>
         ///     Which component does this entry relate to?
         /// </summary>
-        [DataField("component")]
-        public string ComponentName = string.Empty;
+        [DataField("component", required: true)]
+        public string ComponentName;
 
         /// <summary>
         ///     What priority has this entry - entries are sorted high to low.
@@ -91,8 +91,8 @@ namespace Content.Shared.Examine
         /// <summary>
         ///     The FormattedMessage of this entry.
         /// </summary>
-        [DataField("message")]
-        public FormattedMessage Message = new();
+        [DataField("message", required: true)]
+        public FormattedMessage Message;
 
         /// <param name="componentName">Should be set to _componentFactory.GetComponentName(component.GetType()) to properly function.</param>
         public ExamineEntry(string componentName, float priority, FormattedMessage message)
@@ -101,6 +101,13 @@ namespace Content.Shared.Examine
             Priority = priority;
             Message = message;
         }
+
+        private ExamineEntry()
+        {
+            // parameterless ctor is required for data-definition serialization
+            Message = default!;
+            ComponentName = default!;
+        }
     }
 
 }