Added a second check for all shooting commands, not tested yet, seems to work in the simulator