fix battle bug