Fixed turnNumber issues

Changed things to use getCurrentPlayer() instead of calculating by
modulo