Remaining Protected Classes Moved

Remaining Protected Classes Moved from SeverPlayer to
ServerPlayerCombat. Passes Junit Test and build successful