Fixed rounds ending due to everyone being on the same team

And replaced some commonly repeated code with a stock.