From: Plykiya <58439124+Plykiya@users.noreply.github.com>
Date: Sat, 13 Jul 2024 03:00:34 +0000 (-0700)
Subject: Update UtensilSystem.cs to not use Component.Owner (#29971)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=5fa0844f3ca073f0641c54aa6093b328fee10307;p=space-station-14.git

Update UtensilSystem.cs to not use Component.Owner (#29971)

Update UtensilSystem.cs

Co-authored-by: plykiya <plykiya@protonmail.com>
---

diff --git a/Content.Server/Nutrition/EntitySystems/UtensilSystem.cs b/Content.Server/Nutrition/EntitySystems/UtensilSystem.cs
index 43087214a4..d40288183f 100644
--- a/Content.Server/Nutrition/EntitySystems/UtensilSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/UtensilSystem.cs
@@ -31,24 +31,24 @@ namespace Content.Server.Nutrition.EntitySystems
         /// <summary>
         /// Clicked with utensil
         /// </summary>
-        private void OnAfterInteract(EntityUid uid, UtensilComponent component, AfterInteractEvent ev)
+        private void OnAfterInteract(Entity<UtensilComponent> entity, ref AfterInteractEvent ev)
         {
             if (ev.Handled || ev.Target == null || !ev.CanReach)
                 return;
 
-            var result = TryUseUtensil(ev.User, ev.Target.Value, component);
+            var result = TryUseUtensil(ev.User, ev.Target.Value, entity);
             ev.Handled = result.Handled;
         }
 
-        public (bool Success, bool Handled) TryUseUtensil(EntityUid user, EntityUid target, UtensilComponent component)
+        public (bool Success, bool Handled) TryUseUtensil(EntityUid user, EntityUid target, Entity<UtensilComponent> utensil)
         {
             if (!EntityManager.TryGetComponent(target, out FoodComponent? food))
                 return (false, true);
 
             //Prevents food usage with a wrong utensil
-            if ((food.Utensil & component.Types) == 0)
+            if ((food.Utensil & utensil.Comp.Types) == 0)
             {
-                _popupSystem.PopupEntity(Loc.GetString("food-system-wrong-utensil", ("food", target), ("utensil", component.Owner)), user, user);
+                _popupSystem.PopupEntity(Loc.GetString("food-system-wrong-utensil", ("food", target), ("utensil", utensil.Owner)), user, user);
                 return (false, true);
             }