From cc2a89ed86dfee8955ba0c62b0647d071b01655d Mon Sep 17 00:00:00 2001 From: Southbridge <7013162+southbridge-fur@users.noreply.github.com> Date: Thu, 26 Jun 2025 16:32:36 -0400 Subject: [PATCH] Fixed Snacks Mispredicting on Clients (#38522) * Well this works * Removed merge conflict bait * PredictedDel * Apply suggestions from code review --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --- Content.Shared/Nutrition/EntitySystems/FoodSystem.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Content.Shared/Nutrition/EntitySystems/FoodSystem.cs b/Content.Shared/Nutrition/EntitySystems/FoodSystem.cs index 6099939725..ee2c9f3a4a 100644 --- a/Content.Shared/Nutrition/EntitySystems/FoodSystem.cs +++ b/Content.Shared/Nutrition/EntitySystems/FoodSystem.cs @@ -342,7 +342,7 @@ public sealed class FoodSystem : EntitySystem if (component.Trash.Count == 0) { - QueueDel(food); + PredictedQueueDel(food); return; } @@ -353,10 +353,10 @@ public sealed class FoodSystem : EntitySystem var trashes = component.Trash; var tryPickup = _hands.IsHolding(user, food, out _); - Del(food); + PredictedDel(food); foreach (var trash in trashes) { - var spawnedTrash = Spawn(trash, position); + var spawnedTrash = EntityManager.PredictedSpawn(trash, position); // If the user is holding the item if (tryPickup)