Adjust interaction ordering & interaction conditions (#6387)

2022-02-05 15:39:01 +13:00
parent 442d7dbf8e
commit dd61fb46ea
28 changed files with 88 additions and 167 deletions
--- a/Content.Server/Nutrition/EntitySystems/UtensilSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/UtensilSystem.cs
@@ -32,7 +32,7 @@ namespace Content.Server.Nutrition.EntitySystems
        /// </summary>
        private void OnAfterInteract(EntityUid uid, UtensilComponent component, AfterInteractEvent ev)
        {
-            if (ev.Target == null)
+            if (ev.Target == null || !ev.CanReach)
                return;

            if (TryUseUtensil(ev.User, ev.Target.Value, component))