Incorrect item in the death message

Item in the death message is incorrect when player is killed by an arrow after quickly changing held item. It also occurs when an arrow is shot from a bow in the offhand while holding named item in the main hand.