From 2f2cd4aab70703717541e5db3f46ae4831b4129d Mon Sep 17 00:00:00 2001 From: maylokana <88361930+maylokana@users.noreply.github.com> Date: Wed, 13 Mar 2024 23:10:14 -0500 Subject: [PATCH] Drink from closed container fix (#26103) --- Content.Server/Nutrition/EntitySystems/DrinkSystem.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs index 925e50b949..6327cf6ae2 100644 --- a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs @@ -311,6 +311,9 @@ public sealed class DrinkSystem : EntitySystem if (args.Used is null || !_solutionContainer.TryGetSolution(args.Used.Value, args.Solution, out var soln, out var solution)) return; + if (_openable.IsClosed(args.Used.Value, args.Target.Value)) + return; + // TODO this should really be checked every tick. if (_food.IsMouthBlocked(args.Target.Value)) return; -- 2.51.2