fix bug with disconnect in combat