Accounted for moving getTeam function, and added code for friendly fire detection