From e6bb594471973471589ad30712ebef2f3f92f6be Mon Sep 17 00:00:00 2001 From: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com> Date: Sat, 15 Jun 2024 14:35:05 -0700 Subject: [PATCH] Fix speech bubble occlusion being checked from the player's position instead of the eye's (#29012) (cherry picked from commit 2ddebba0e9a2889c8b2623aad6d6fa6c2b384b2a) --- .../UserInterface/Systems/Chat/ChatUIController.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs index 6193ba339f..e87587ad70 100644 --- a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs +++ b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs @@ -18,9 +18,8 @@ using Content.Client.UserInterface.Systems.Gameplay; using Content.Shared.Administration; using Content.Shared.CCVar; using Content.Shared.Chat; -using Content.Shared.Decals; using Content.Shared.Damage.ForceSay; -using Content.Shared.Examine; +using Content.Shared.Decals; using Content.Shared.Input; using Content.Shared.Radio; using Content.Shared.Roles.RoleCodeword; @@ -632,7 +631,7 @@ public sealed class ChatUIController : UIController var predicate = static (EntityUid uid, (EntityUid compOwner, EntityUid? attachedEntity) data) => uid == data.compOwner || uid == data.attachedEntity; var playerPos = player != null - ? _transform?.GetMapCoordinates(player.Value) ?? MapCoordinates.Nullspace + ? _eye.CurrentEye.Position : MapCoordinates.Nullspace; var occluded = player != null && _examine.IsOccluded(player.Value);