Kill ContainerHelpers (#20908)

2023-10-11 02:18:49 -07:00
parent 14dac914ce
commit dbb7c7065a
14 changed files with 54 additions and 46 deletions
--- a/Content.Server/Hands/Systems/HandsSystem.cs
+++ b/Content.Server/Hands/Systems/HandsSystem.cs
@@ -169,9 +169,9 @@ namespace Content.Server.Hands.Systems

            if (playerSession.AttachedEntity is not {Valid: true} player ||
                !Exists(player) ||
-                player.IsInContainer() ||
+                ContainerSystem.IsEntityInContainer(player) ||
                !TryComp(player, out HandsComponent? hands) ||
-                hands.ActiveHandEntity is not EntityUid throwEnt ||
+                hands.ActiveHandEntity is not { } throwEnt ||
                !_actionBlockerSystem.CanThrow(player, throwEnt))
                return false;