A bill based in part on the shooting death of a Wintergreen Police Department officer has passed the General Assembly.