--- a/net/minecraft/server/TileEntityCommand.java
+++ b/net/minecraft/server/TileEntityCommand.java
@@ -9,6 +9,13 @@
     private boolean f;
     private boolean g;
     private final CommandBlockListenerAbstract h = new CommandBlockListenerAbstract() {
+        // CraftBukkit start
+        @Override
+        public org.bukkit.command.CommandSender getBukkitSender(CommandListenerWrapper wrapper) {
+            return new org.bukkit.craftbukkit.command.CraftBlockCommandSender(wrapper, TileEntityCommand.this);
+        }
+        // CraftBukkit end
+
         public void setCommand(String s) {
             super.setCommand(s);
             TileEntityCommand.this.update();