Update LocalPlayer to LocalEntity where applicable

Simple-Station · Apr 27, 2024 · cdf7f1c · cdf7f1c
1 parent e6698fe
commit cdf7f1c
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/Content.Client/Parkstation/Chat/ShadowkinChatUpdateSystem.cs b/Content.Client/Parkstation/Chat/ShadowkinChatUpdateSystem.cs
@@ -19,7 +19,7 @@ public override void Initialize()
         }
 
 
-        public EmpathyChatComponent? Player => CompOrNull<EmpathyChatComponent>(_playerManager.LocalPlayer?.ControlledEntity);
+        public EmpathyChatComponent? Player => CompOrNull<EmpathyChatComponent>(_playerManager.LocalEntity);
         public bool IsShadowkin => Player != null;
 
         private void OnInit(EntityUid uid, EmpathyChatComponent component, ComponentInit args)

diff --git a/Content.Client/Parkstation/Overlays/Shaders/ColorTintOverlay.cs b/Content.Client/Parkstation/Overlays/Shaders/ColorTintOverlay.cs
@@ -43,7 +43,7 @@ public ColorTintOverlay()
     protected override void Draw(in OverlayDrawArgs args)
     {
         if (ScreenTexture == null ||
-            _player.LocalPlayer?.ControlledEntity is not { Valid: true } player ||
+            _player.LocalEntity is not { Valid: true } player ||
             Comp != null && !_entity.HasComponent(player, Comp.GetType()))
             return;
 

diff --git a/Content.Client/Parkstation/Overlays/Shaders/EtherealOverlay.cs b/Content.Client/Parkstation/Overlays/Shaders/EtherealOverlay.cs
@@ -25,7 +25,7 @@ public EtherealOverlay()
     protected override void Draw(in OverlayDrawArgs args)
     {
         if (ScreenTexture == null) return;
-        if (_player.LocalPlayer?.ControlledEntity is not { Valid: true } player) return;
+        if (_player.LocalEntity is not { Valid: true } player) return;
 
         _shader?.SetParameter("SCREEN_TEXTURE", ScreenTexture);
 

diff --git a/Content.Client/Parkstation/Overlays/Shaders/IgnoreHumanoidWithComponentOverlay.cs b/Content.Client/Parkstation/Overlays/Shaders/IgnoreHumanoidWithComponentOverlay.cs
@@ -30,7 +30,7 @@ protected override void Draw(in OverlayDrawArgs args)
 
         foreach (var humanoid in _entityManager.EntityQuery<HumanoidAppearanceComponent>(true))
         {
-            if (_playerManager.LocalPlayer?.ControlledEntity == humanoid.Owner)
+            if (_playerManager.LocalEntity == humanoid.Owner)
                 continue;
 
             var cont = true;

diff --git a/Content.Client/Parkstation/Species/Shadowkin/Systems/ShadowkinPowerSystem.DarkSwapped.cs b/Content.Client/Parkstation/Species/Shadowkin/Systems/ShadowkinPowerSystem.DarkSwapped.cs
@@ -34,15 +34,15 @@ public override void Initialize()
 
     private void OnStartup(EntityUid uid, ShadowkinDarkSwappedComponent component, ComponentStartup args)
     {
-        if (_player.LocalPlayer?.ControlledEntity != uid)
+        if (_player.LocalEntity != uid)
             return;
 
         AddOverlay();
     }
 
     private void OnShutdown(EntityUid uid, ShadowkinDarkSwappedComponent component, ComponentShutdown args)
     {
-        if (_player.LocalPlayer?.ControlledEntity != uid)
+        if (_player.LocalEntity != uid)
             return;
 
         RemoveOverlay();

diff --git a/Content.Client/Parkstation/Species/Shadowkin/Systems/ShadowkinSystem.Tint.cs b/Content.Client/Parkstation/Species/Shadowkin/Systems/ShadowkinSystem.Tint.cs
@@ -39,15 +39,15 @@ public override void Initialize()
 
     private void OnStartup(EntityUid uid, ShadowkinComponent component, ComponentStartup args)
     {
-        if (_player.LocalPlayer?.ControlledEntity != uid)
+        if (_player.LocalEntity != uid)
             return;
 
         _overlay.AddOverlay(_tintOverlay);
     }
 
     private void OnShutdown(EntityUid uid, ShadowkinComponent component, ComponentShutdown args)
     {
-        if (_player.LocalPlayer?.ControlledEntity != uid)
+        if (_player.LocalEntity != uid)
             return;
 
         _overlay.RemoveOverlay(_tintOverlay);
@@ -73,7 +73,7 @@ public override void Update(float frameTime)
     {
         base.Update(frameTime);
 
-        var uid = _player.LocalPlayer?.ControlledEntity;
+        var uid = _player.LocalEntity;
         if (uid == null ||
             !_entity.TryGetComponent(uid, out ShadowkinComponent? comp) ||
             !_entity.TryGetComponent(uid, out SpriteComponent? sprite) ||