Fixed Bug#7359
Map Crashed on battle_calc_return_damage.
crash fix
Merge remote-tracking branch 'upstream/master'
crash fix