Fixed bug where movement wasn't stopped when entering combat sometimes

fixes #109