--- a/net/minecraft/world/level/CommandBlockListenerAbstract.java
+++ b/net/minecraft/world/level/CommandBlockListenerAbstract.java
@@ -31,6 +31,10 @@
     private IChatBaseComponent lastOutput;
     private String command = "";
     private IChatBaseComponent name;
+    // CraftBukkit start
+    @Override
+    public abstract org.bukkit.command.CommandSender getBukkitSender(CommandListenerWrapper wrapper);
+    // CraftBukkit end
 
     public CommandBlockListenerAbstract() {
         this.name = CommandBlockListenerAbstract.DEFAULT_NAME;
@@ -127,7 +131,7 @@
 
                         });
 
-                        minecraftserver.getCommandDispatcher().a(commandlistenerwrapper, this.command);
+                        minecraftserver.getCommandDispatcher().dispatchServerCommand(commandlistenerwrapper, this.command); // CraftBukkit
                     } catch (Throwable throwable) {
                         CrashReport crashreport = CrashReport.a(throwable, "Executing command block");
                         CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Command to be executed");
