Fix player count for public votes.

This was broken by commit 552a0421e16b9d864a4d8b61070140ff6c40a0aa.
Merge branch 'gameplay/viech' into gameplay/testing
Cleanup adding bot obstacles for buildings.