remove combat::update because most of it was in thinker