15w31a Main Hand Switches After Death

Bug:
My main hand was my left hand while playing 15w31a, but suddenly switched to my right hand after death.

Steps to Reproduce:
1. Entered infinite end zone with left hand option on.
2. Dived of a cliff, killing my player.
3. I respawn with my main hand being right, not left.