]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Fix dev server crashes caused by putting pills in drinks, depositing spesos, making...
authorMossyGreySlope <mossygreyslope@gmail.com>
Thu, 13 Feb 2025 20:31:38 +0000 (09:31 +1300)
committerGitHub <noreply@github.com>
Thu, 13 Feb 2025 20:31:38 +0000 (15:31 -0500)
* combine TrySpike into OnInteractUsing

* mark spike drink event as handled

* mark speso insertion event as handled

* mark food sequence event as handled

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs

index ae8215ac6aee7d450cfc9868169bc4f3e8119c9e..d5b4a0e2b3658d20e1d04a7a07392bd2b8ec0b0d 100644 (file)
@@ -39,7 +39,7 @@ public sealed class FoodSequenceSystem : SharedFoodSequenceSystem
     private void OnInteractUsing(Entity<FoodSequenceStartPointComponent> ent, ref InteractUsingEvent args)
     {
         if (TryComp<FoodSequenceElementComponent>(args.Used, out var sequenceElement))
-            TryAddFoodElement(ent, (args.Used, sequenceElement), args.User);
+            args.Handled = TryAddFoodElement(ent, (args.Used, sequenceElement), args.User);
     }
 
     private void OnIngredientAdded(Entity<FoodMetamorphableByAddingComponent> ent, ref FoodSequenceIngredientAddedEvent args)