- FINALLY fixed the errors being thrown while in combat