diff --git a/src/main/java/kamkeel/command/CommandCommand.java b/src/main/java/kamkeel/command/CommandCommand.java
index 23fa242ca..80a41ec28 100644
--- a/src/main/java/kamkeel/command/CommandCommand.java
+++ b/src/main/java/kamkeel/command/CommandCommand.java
@@ -31,7 +31,6 @@ public class CommandCommand extends CommandKamkeelBase {
         }
 
         String commandId = args[0];
-
         String[] commandArgs = new String[args.length - 1];
         System.arraycopy(args, 1, commandArgs, 0, args.length - 1);
 
diff --git a/src/main/java/noppes/npcs/EventHooks.java b/src/main/java/noppes/npcs/EventHooks.java
index 5bb1dc4eb..43e6d570f 100644
--- a/src/main/java/noppes/npcs/EventHooks.java
+++ b/src/main/java/noppes/npcs/EventHooks.java
@@ -578,11 +578,9 @@ public class EventHooks {
         return false;
     }
 
-    public static void onScriptedCommand(CustomNPCsEvent.ScriptedCommandEvent event) {
-        ForgeDataScript handler = ScriptController.Instance.forgeScripts;
-        if (handler.isEnabled()) {
-            handler.callScript(EnumScriptType.SCRIPT_COMMAND, event);
-        }
+    public static boolean onScriptedCommand(CustomNPCsEvent.ScriptedCommandEvent event) {
+        ScriptController.Instance.playerScripts.callScript(EnumScriptType.SCRIPT_COMMAND, event);
+        return NpcAPI.EVENT_BUS.post(event);
     }
 
     public static void onCustomGuiButton(IPlayer player, ICustomGui gui, int buttonId) {
diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptPlayers.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptPlayers.java
index 9783eff76..3f2774fe3 100644
--- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptPlayers.java
+++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptPlayers.java
@@ -59,6 +59,7 @@ public class GuiScriptPlayers extends GuiScriptInterface {
         hookList.add("dialogOpen");
         hookList.add("dialogOption");
         hookList.add("dialogClose");
+        hookList.add("scriptCommand");
         hookList.add("customGuiClosed");
         hookList.add("customGuiButton");
         hookList.add("customGuiSlot");