From 575b12dcdc01660ebb791aa1a1389e3559d172a6 Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Wed, 27 Mar 2019 17:12:43 +0100 Subject: [PATCH] Use SharedSpeciesComponent on the client. --- Content.Client/GameObjects/Components/Mobs/SpeciesUI.cs | 7 ++----- .../GameObjects/Components/Mobs/SharedSpeciesComponent.cs | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Content.Client/GameObjects/Components/Mobs/SpeciesUI.cs b/Content.Client/GameObjects/Components/Mobs/SpeciesUI.cs index cbdf25ba7a..a8fc72ba7f 100644 --- a/Content.Client/GameObjects/Components/Mobs/SpeciesUI.cs +++ b/Content.Client/GameObjects/Components/Mobs/SpeciesUI.cs @@ -16,6 +16,7 @@ using SS14.Shared.IoC; using SS14.Shared.Log; using SS14.Shared.Utility; using System.Collections.Generic; +using Content.Shared.GameObjects.Components.Mobs; using SS14.Client.Graphics.Overlays; namespace Content.Client.GameObjects @@ -23,12 +24,8 @@ namespace Content.Client.GameObjects /// /// A character UI component which shows the current damage state of the mob (living/dead) /// - public class SpeciesUI : Component, ICharacterUI + public class SpeciesUI : SharedSpeciesComponent, ICharacterUI { - public override string Name => "Species"; - - public override uint? NetID => ContentNetIDs.SPECIES; - /// /// Holds the godot control for the species window /// diff --git a/Content.Shared/GameObjects/Components/Mobs/SharedSpeciesComponent.cs b/Content.Shared/GameObjects/Components/Mobs/SharedSpeciesComponent.cs index 2e78fa4642..68755c36e1 100644 --- a/Content.Shared/GameObjects/Components/Mobs/SharedSpeciesComponent.cs +++ b/Content.Shared/GameObjects/Components/Mobs/SharedSpeciesComponent.cs @@ -8,7 +8,7 @@ namespace Content.Shared.GameObjects.Components.Mobs { public sealed override string Name => "Species"; - public override uint? NetID => ContentNetIDs.SPECIES; + public sealed override uint? NetID => ContentNetIDs.SPECIES; [Serializable, NetSerializable] public enum MobVisuals @@ -31,4 +31,4 @@ namespace Content.Shared.GameObjects.Components.Mobs } } -} \ No newline at end of file +}