remove unused parameters && fix paoxiao armor nullification