diff --git a/Content.Server/GameObjects/Components/Mobs/BuckleComponent.cs b/Content.Server/GameObjects/Components/Mobs/BuckleComponent.cs index bc309a7240..82d9f809d4 100644 --- a/Content.Server/GameObjects/Components/Mobs/BuckleComponent.cs +++ b/Content.Server/GameObjects/Components/Mobs/BuckleComponent.cs @@ -137,14 +137,17 @@ namespace Content.Server.GameObjects.Components.Mobs var strapPosition = strap.Owner.Transform.MapPosition; - if (!InteractionChecks.InRangeUnobstructed(user, strapPosition, _range) || - ContainerHelpers.IsInContainer(Owner)) + if (!InteractionChecks.InRangeUnobstructed(user, strapPosition, _range)) { - _notifyManager.PopupMessage(user, user, - Loc.GetString("You can't reach there!")); return false; } + if (ContainerHelpers.IsInContainer(Owner)) + { + _notifyManager.PopupMessage(strap.Owner, user, + Loc.GetString("You can't reach there!")); + } + if (!user.HasComponent()) { _notifyManager.PopupMessage(user, user,