Fixed some bugs in combat method (Probably added some new bugs,too)