Fixed combat commands and added a better check for combat commands