From 092f234943dcdf5b5b89732c5d1d1e8f8d0343ab Mon Sep 17 00:00:00 2001
From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Date: Sun, 9 Feb 2020 01:42:44 -0800
Subject: [PATCH] Add a check to make sure the CombatMode is the current player
 (#663)

---
 .../Components/Mobs/CombatModeComponent.cs           | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/Content.Client/GameObjects/Components/Mobs/CombatModeComponent.cs b/Content.Client/GameObjects/Components/Mobs/CombatModeComponent.cs
index 48ae173ad2..06b0235838 100644
--- a/Content.Client/GameObjects/Components/Mobs/CombatModeComponent.cs
+++ b/Content.Client/GameObjects/Components/Mobs/CombatModeComponent.cs
@@ -1,6 +1,7 @@
-using Content.Client.UserInterface;
+using Content.Client.UserInterface;
 using Content.Shared.GameObjects.Components.Mobs;
 using Robust.Client.GameObjects;
+using Robust.Client.Player;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Network;
@@ -12,6 +13,10 @@ namespace Content.Client.GameObjects.Components.Mobs
     [RegisterComponent]
     public sealed class CombatModeComponent : SharedCombatModeComponent
     {
+#pragma warning disable 649
+        [Dependency] private readonly IPlayerManager _playerManager;
+#pragma warning restore 649
+
         [ViewVariables(VVAccess.ReadWrite)]
         public bool IsInCombatMode { get; private set; }
 
@@ -30,7 +35,10 @@ namespace Content.Client.GameObjects.Components.Mobs
 
             IsInCombatMode = state.IsInCombatMode;
             ActiveZone = state.TargetingZone;
-            UpdateHud();
+            if (Owner == _playerManager.LocalPlayer.ControlledEntity)
+            {
+                UpdateHud();
+            }
         }
 
         public override void HandleMessage(ComponentMessage message, INetChannel netChannel = null, IComponent component = null)