diff --git a/nms-patches/CommandBlockListenerAbstract.patch b/nms-patches/CommandBlockListenerAbstract.patch
index 593e8ef27f..515259230b 100644
--- a/nms-patches/CommandBlockListenerAbstract.patch
+++ b/nms-patches/CommandBlockListenerAbstract.patch
@@ -1,5 +1,5 @@
---- ../work/decompile-8eb82bde/net/minecraft/server/CommandBlockListenerAbstract.java	2014-12-11 20:04:50.493619968 +0000
-+++ src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java	2014-12-11 20:02:45.005621331 +0000
+--- ../work/decompile-8eb82bde/net/minecraft/server/CommandBlockListenerAbstract.java	2014-12-23 01:00:07.818620695 +0000
++++ src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java	2014-12-23 01:00:07.818620695 +0000
 @@ -4,6 +4,13 @@
  import java.util.Date;
  import java.util.concurrent.Callable;
@@ -34,7 +34,7 @@
              } catch (Throwable throwable) {
                  CrashReport crashreport = CrashReport.a(throwable, "Executing command block");
                  CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Command to be executed");
-@@ -91,8 +102,129 @@
+@@ -91,8 +102,133 @@
          } else {
              this.b = 0;
          }
@@ -51,10 +51,14 @@
 +        String[] args = command.split(" ");
 +        ArrayList<String[]> commands = new ArrayList<String[]>();
 +
++        String cmd = args[0];
++        if (cmd.startsWith("minecraft:")) cmd = cmd.substring("minecraft:".length());
++        if (cmd.startsWith("bukkit:")) cmd = cmd.substring("bukkit:".length());
++
 +        // Block disallowed commands
-+        if (args[0].equalsIgnoreCase("stop") || args[0].equalsIgnoreCase("kick") || args[0].equalsIgnoreCase("op")
-+                || args[0].equalsIgnoreCase("deop") || args[0].equalsIgnoreCase("ban") || args[0].equalsIgnoreCase("ban-ip")
-+                || args[0].equalsIgnoreCase("pardon") || args[0].equalsIgnoreCase("pardon-ip") || args[0].equalsIgnoreCase("reload")) {
++        if (cmd.equalsIgnoreCase("stop") || cmd.equalsIgnoreCase("kick") || cmd.equalsIgnoreCase("op")
++                || cmd.equalsIgnoreCase("deop") || cmd.equalsIgnoreCase("ban") || cmd.equalsIgnoreCase("ban-ip")
++                || cmd.equalsIgnoreCase("pardon") || cmd.equalsIgnoreCase("pardon-ip") || cmd.equalsIgnoreCase("reload")) {
 +            return 0;
 +        }
 +