From 74f91bd0a229717d687c38ca3b4e97f1401c02af Mon Sep 17 00:00:00 2001
From: SleepyScarecrow <136123749+SleepyScarecrow@users.noreply.github.com>
Date: Fri, 25 Oct 2024 11:59:51 -0400
Subject: [PATCH] Ui system update

---
 Content.Server/Medical/PenLightSystem.cs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/Content.Server/Medical/PenLightSystem.cs b/Content.Server/Medical/PenLightSystem.cs
index 29cb4888ebc..f1df356cab0 100644
--- a/Content.Server/Medical/PenLightSystem.cs
+++ b/Content.Server/Medical/PenLightSystem.cs
@@ -99,11 +99,10 @@ public bool TryStartExam(EntityUid uid, EntityUid target, EntityUid user, PenLig
     }
     private void OpenUserInterface(EntityUid user, EntityUid penlight)
     {
-        if (!TryComp<ActorComponent>(user, out var actor)
-            || !_uiSystem.TryGetOpenUi(penlight, PenLightUiKey.Key, out var ui))
+        if (!_uiSystem.HasUi(penlight, PenLightUiKey.Key))
             return;
 
-        _uiSystem.OpenUi(ui.Owner, ui.UiKey, actor.PlayerSession);
+        _uiSystem.OpenUi(penlight, PenLightUiKey.Key, user);
     }
 
     /// <summary>
@@ -111,7 +110,7 @@ private void OpenUserInterface(EntityUid user, EntityUid penlight)
     /// </summary>
     private void Diagnose(EntityUid penlight, EntityUid target)
     {
-        if (!_uiSystem.TryGetOpenUi(penlight, PenLightUiKey.Key, out var ui)
+        if (!_uiSystem.HasUi(penlight, PenLightUiKey.Key)
             || !HasComp<EyeComponent>(target)
             || !HasComp<DamageableComponent>(target))
             return;
@@ -136,8 +135,8 @@ private void Diagnose(EntityUid penlight, EntityUid target)
         var healthy = !(blind || drunk || eyeDamage || seeingRainbows);
 
         _uiSystem.ServerSendUiMessage(
-            ui.Owner,
-            ui.UiKey,
+            penlight,
+            PenLightUiKey.Key,
             new PenLightUserMessage(GetNetEntity(target),
                 blind,
                 drunk,