diff --git a/Content.Shared/Popups/SharedPopupExtensions.cs b/Content.Shared/Popups/SharedPopupExtensions.cs index ca88410654..ae3d9fde27 100644 --- a/Content.Shared/Popups/SharedPopupExtensions.cs +++ b/Content.Shared/Popups/SharedPopupExtensions.cs @@ -1,5 +1,6 @@ using Robust.Shared.GameObjects; using Robust.Shared.Map; +using Robust.Shared.Player; namespace Content.Shared.Popups { @@ -16,7 +17,7 @@ namespace Content.Shared.Popups { var popupSystem = EntitySystem.Get(); - popupSystem.PopupEntity(message, source.Uid, popupSystem.GetFilterFromEntity(viewer)); + popupSystem.PopupEntity(message, source.Uid, Filter.Entities(viewer.Uid)); } /// @@ -38,7 +39,7 @@ namespace Content.Shared.Popups public static void PopupMessage(this EntityCoordinates coordinates, IEntity viewer, string message) { var popupSystem = EntitySystem.Get(); - popupSystem.PopupCoordinates(message, coordinates, popupSystem.GetFilterFromEntity(viewer)); + popupSystem.PopupCoordinates(message, coordinates, Filter.Entities(viewer.Uid)); } /// @@ -51,7 +52,7 @@ namespace Content.Shared.Popups public static void PopupMessageCursor(this IEntity viewer, string message) { var popupSystem = EntitySystem.Get(); - popupSystem.PopupCursor(message, popupSystem.GetFilterFromEntity(viewer)); + popupSystem.PopupCursor(message, Filter.Entities(viewer.Uid)); } } } diff --git a/Content.Shared/Popups/SharedPopupSystem.cs b/Content.Shared/Popups/SharedPopupSystem.cs index 4c74adf33f..019600fc1c 100644 --- a/Content.Shared/Popups/SharedPopupSystem.cs +++ b/Content.Shared/Popups/SharedPopupSystem.cs @@ -33,16 +33,6 @@ namespace Content.Shared.Popups /// The UID of the entity. /// Filter for the players that will see the popup. public abstract void PopupEntity(string message, EntityUid uid, Filter filter); - - /// - /// Given an , returns a that is either empty or contains the - /// player attached to the entity. - /// - /// Using this method is NOT recommended, please use one of the other methods instead. - public Filter GetFilterFromEntity(IEntity entity) - { - return Filter.Entities(entity.Uid); - } } ///