Fix compile and remove wrong combat timer check