Some bugfixing in combat. Index out of bounds should be fixed