[FIX] integrating new code

Trying to make the new combat module work. Some stupid code in the
attackhandler had to go.