Moved shot collision code to Shot.update()