Fixed some bugs in player waiting and rolling

Fixed some bugs in player waiting and rolling