Revert "Fix team scoreboard"

This reverts commit 95bacd4bfd2b68b0084c3e3b186e796838223a20.
Better condition fix