X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2Fcommands%2Fshooter%2FResetCatapult.java;h=3c46bf4dfcf757e1e651bdf7a665d49822e6a458;hb=fee6b62e5434872f8f10c74874179a45e697205e;hp=ecdfce6ebf762120c56b4927d3a62337fadd937b;hpb=e062fd0698aa9583dd007f3a3759dd2adc9d2010;p=3501%2Fstronghold-2016

diff --git a/src/org/usfirst/frc/team3501/robot/commands/shooter/ResetCatapult.java b/src/org/usfirst/frc/team3501/robot/commands/shooter/ResetCatapult.java
index ecdfce6e..3c46bf4d 100644
--- a/src/org/usfirst/frc/team3501/robot/commands/shooter/ResetCatapult.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/shooter/ResetCatapult.java
@@ -1,5 +1,6 @@
 package org.usfirst.frc.team3501.robot.commands.shooter;
 
+import org.usfirst.frc.team3501.robot.Constants;
 import org.usfirst.frc.team3501.robot.Robot;
 
 import edu.wpi.first.wpilibj.command.Command;
@@ -12,7 +13,9 @@ public class ResetCatapult extends Command {
 
   @Override
   protected void initialize() {
-    Robot.shooter.resetCatapult();
+    if (Robot.shooter.getCatapult1State() == Constants.Shooter.SHOOT
+        || Robot.shooter.getCatapult2State() == Constants.Shooter.SHOOT)
+      Robot.shooter.resetCatapult();
   }
 
   @Override