--- a/net/minecraft/commands/CommandSource.java
+++ b/net/minecraft/commands/CommandSource.java
@@ -3,10 +3,10 @@
 import net.minecraft.network.chat.Component;
 
 public interface CommandSource {
+
     CommandSource NULL = new CommandSource() {
         @Override
-        public void sendSystemMessage(Component message) {
-        }
+        public void sendSystemMessage(Component message) {}
 
         @Override
         public boolean acceptsSuccess() {
@@ -22,6 +22,13 @@
         public boolean shouldInformAdmins() {
             return false;
         }
+
+        // CraftBukkit start
+        @Override
+        public org.bukkit.command.CommandSender getBukkitSender(CommandSourceStack wrapper) {
+            return io.papermc.paper.brigadier.NullCommandSender.INSTANCE; // Paper - expose a no-op CommandSender
+        }
+        // CraftBukkit end
     };
 
     void sendSystemMessage(Component message);
@@ -35,4 +42,6 @@
     default boolean alwaysAccepts() {
         return false;
     }
+
+    org.bukkit.command.CommandSender getBukkitSender(CommandSourceStack wrapper); // CraftBukkit
 }
