From 2f4e90a3e09ddf356206a008539a96d80e61618a Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Sat, 31 Dec 2022 12:46:04 +1300
Subject: [PATCH] Fix popup bugs (#13233)

---
 Content.Client/Popups/PopupSystem.cs       | 4 ++--
 Content.Shared/Stacks/SharedStackSystem.cs | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Content.Client/Popups/PopupSystem.cs b/Content.Client/Popups/PopupSystem.cs
index 234217d784..a8a060d6f0 100644
--- a/Content.Client/Popups/PopupSystem.cs
+++ b/Content.Client/Popups/PopupSystem.cs
@@ -109,13 +109,13 @@ namespace Content.Client.Popups
         public override void PopupEntity(string message, EntityUid uid, EntityUid recipient, PopupType type = PopupType.Small)
         {
             if (_playerManager.LocalPlayer?.ControlledEntity == recipient)
-                PopupCursor(message, type);
+                PopupEntity(message, uid, type);
         }
 
         public override void PopupEntity(string message, EntityUid uid, ICommonSession recipient, PopupType type = PopupType.Small)
         {
             if (_playerManager.LocalPlayer?.Session == recipient)
-                PopupCursor(message, type);
+                PopupEntity(message, uid, type);
         }
 
         public override void PopupEntity(string message, EntityUid uid, Filter filter, bool recordReplay, PopupType type=PopupType.Small)
diff --git a/Content.Shared/Stacks/SharedStackSystem.cs b/Content.Shared/Stacks/SharedStackSystem.cs
index 39f9ba4fef..213d626cdf 100644
--- a/Content.Shared/Stacks/SharedStackSystem.cs
+++ b/Content.Shared/Stacks/SharedStackSystem.cs
@@ -72,18 +72,18 @@ namespace Content.Shared.Stacks
             switch (transfered)
             {
                 case > 0:
-                    PopupSystem.PopupCoordinates($"+{transfered}", popupPos);
+                    PopupSystem.PopupCoordinates($"+{transfered}", popupPos, Filter.Local(), false);
 
                     if (GetAvailableSpace(recipientStack) == 0)
                     {
                         PopupSystem.PopupCoordinates(Loc.GetString("comp-stack-becomes-full"),
-                            popupPos.Offset(new Vector2(0, -0.5f)));
+                            popupPos.Offset(new Vector2(0, -0.5f)), Filter.Local(), false);
                     }
 
                     break;
 
                 case 0 when GetAvailableSpace(recipientStack) == 0:
-                    PopupSystem.PopupCoordinates(Loc.GetString("comp-stack-already-full"), popupPos);
+                    PopupSystem.PopupCoordinates(Loc.GetString("comp-stack-already-full"), popupPos, Filter.Local(), false);
                     break;
             }
         }