Fixed silly combat bug