From af652817d9205cc6040dba7d2f34fd524150670d Mon Sep 17 00:00:00 2001
From: Ryan Blue <ryanzblue@gmail.com>
Date: Wed, 6 Nov 2024 18:10:37 -0500
Subject: [PATCH] [commands] Revert "WrappedCommand: Call wrapped command
 initSendable (#6471)" (#7353)

This reverts commit 7bc0380694916fdb0082c6a746d1d937d6258c03.

Calling initSendable on the wrapped command is fundamentally flawed as the wrapper is the command being sent.
---
 .../java/edu/wpi/first/wpilibj2/command/WrapperCommand.java | 6 ------
 .../src/main/native/cpp/frc2/command/WrapperCommand.cpp     | 4 ----
 .../src/main/native/include/frc2/command/WrapperCommand.h   | 2 --
 3 files changed, 12 deletions(-)

diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/WrapperCommand.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/WrapperCommand.java
index 00a1d88772..5e6ccaef82 100644
--- a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/WrapperCommand.java
+++ b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/WrapperCommand.java
@@ -4,7 +4,6 @@
 
 package edu.wpi.first.wpilibj2.command;
 
-import edu.wpi.first.util.sendable.SendableBuilder;
 import java.util.Set;
 
 /**
@@ -101,9 +100,4 @@ public abstract class WrapperCommand extends Command {
   public InterruptionBehavior getInterruptionBehavior() {
     return m_command.getInterruptionBehavior();
   }
-
-  @Override
-  public void initSendable(SendableBuilder builder) {
-    m_command.initSendable(builder);
-  }
 }
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/WrapperCommand.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/WrapperCommand.cpp
index 775e84a30c..cc8757a6fa 100644
--- a/wpilibNewCommands/src/main/native/cpp/frc2/command/WrapperCommand.cpp
+++ b/wpilibNewCommands/src/main/native/cpp/frc2/command/WrapperCommand.cpp
@@ -45,7 +45,3 @@ Command::InterruptionBehavior WrapperCommand::GetInterruptionBehavior() const {
 wpi::SmallSet<Subsystem*, 4> WrapperCommand::GetRequirements() const {
   return m_command->GetRequirements();
 }
-
-void WrapperCommand::InitSendable(wpi::SendableBuilder& builder) {
-  m_command->InitSendable(builder);
-}
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/WrapperCommand.h b/wpilibNewCommands/src/main/native/include/frc2/command/WrapperCommand.h
index e6a2b9ffa7..97a8693dc0 100644
--- a/wpilibNewCommands/src/main/native/include/frc2/command/WrapperCommand.h
+++ b/wpilibNewCommands/src/main/native/include/frc2/command/WrapperCommand.h
@@ -68,8 +68,6 @@ class WrapperCommand : public CommandHelper<Command, WrapperCommand> {
 
   wpi::SmallSet<Subsystem*, 4> GetRequirements() const override;
 
-  void InitSendable(wpi::SendableBuilder& builder) override;
-
  protected:
   /// Command being wrapped.
   std::unique_ptr<Command> m_command;