Handle updated OnMapEnd instead of OnMapStart

Should fix issues when round_start happens before OnMapStart