[Congdar]

I just remembered that I already fixed bot trades while in combat in r1771 /selfbonk, so maybe that's why it seemed they eliminated that problem.

Like I said, those were very minor things... the rest looks good.