Added checks in Combat::Setup
Partially filled subserver thread function
Merge remote-tracking branch 'origin/master'