Combat ends if no defenders

Some commands put you in combat even without a defender, so this will
end that combat after a few seconds.
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2