refactored WarriorServer