From c8193ef39392782f31b637e1baf9973b38662644 Mon Sep 17 00:00:00 2001
From: metalgearsloth <comedian_vs_clown@hotmail.com>
Date: Mon, 4 Oct 2021 01:29:50 +1100
Subject: [PATCH] Fix master

---
 Content.Server/Cuffs/CuffableSystem.cs | 3 ++-
 Content.Server/Stack/StackSystem.cs    | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Content.Server/Cuffs/CuffableSystem.cs b/Content.Server/Cuffs/CuffableSystem.cs
index 3b1654c26e..dbbbe75efc 100644
--- a/Content.Server/Cuffs/CuffableSystem.cs
+++ b/Content.Server/Cuffs/CuffableSystem.cs
@@ -9,6 +9,7 @@ using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.IoC;
+using Robust.Shared.Player;
 
 namespace Content.Server.Cuffs
 {
@@ -65,7 +66,7 @@ namespace Content.Server.Cuffs
             }
             if (args.Cancelled)
             {
-                _popupSystem.PopupEntity(Loc.GetString("cuffable-component-cannot-interact-message"), args.Target, _popupSystem.GetFilterFromEntity(userEntity));
+                _popupSystem.PopupEntity(Loc.GetString("cuffable-component-cannot-interact-message"), args.Target, Filter.Entities(userEntity.Uid));
             }
         }
 
diff --git a/Content.Server/Stack/StackSystem.cs b/Content.Server/Stack/StackSystem.cs
index 11b2becad5..728ccefb1f 100644
--- a/Content.Server/Stack/StackSystem.cs
+++ b/Content.Server/Stack/StackSystem.cs
@@ -8,6 +8,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
+using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.Stack
@@ -94,7 +95,7 @@ namespace Content.Server.Stack
                 popupPos = args.User.Transform.Coordinates;
             }
 
-            var filter = _popupSystem.GetFilterFromEntity(args.User);
+            var filter = Filter.Entities(args.User.Uid);
 
             switch (toTransfer)
             {