Fixed several combat bugs