From afe0e8106e6b4d75d0d36c3d149fe33aed098a9a Mon Sep 17 00:00:00 2001
From: Kam <KamronVaswani@gmail.com>
Date: Mon, 6 Oct 2025 20:15:08 -0400
Subject: [PATCH] Allow console scripted commands

---
 .../java/kamkeel/npcs/command/CommandCommand.java     | 11 ++++-------
 src/main/java/noppes/npcs/EventHooks.java             |  9 +++++++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/main/java/kamkeel/npcs/command/CommandCommand.java b/src/main/java/kamkeel/npcs/command/CommandCommand.java
index 7ba4d8127..2e2f449e5 100644
--- a/src/main/java/kamkeel/npcs/command/CommandCommand.java
+++ b/src/main/java/kamkeel/npcs/command/CommandCommand.java
@@ -2,7 +2,6 @@ package kamkeel.npcs.command;
 
 import net.minecraft.command.CommandException;
 import net.minecraft.command.ICommandSender;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.ChunkCoordinates;
 import net.minecraft.util.math.BlockPos;
 import noppes.npcs.EventHooks;
@@ -43,13 +42,11 @@ public class CommandCommand extends CommandKamkeelBase {
         ChunkCoordinates senderCoords = sender.getPlayerCoordinates();
         IPos senderPos = NpcAPI.Instance().getIPos(new BlockPos(senderCoords.posX, senderCoords.posY, senderCoords.posZ));
 
-        if (sender instanceof EntityPlayer) {
-            CustomNPCsEvent.ScriptedCommandEvent event = new CustomNPCsEvent.ScriptedCommandEvent(senderWorld, senderPos, sender.getCommandSenderName(), commandId, commandArgs);
-            EventHooks.onScriptedCommand((EntityPlayer) sender, event);
+        CustomNPCsEvent.ScriptedCommandEvent event = new CustomNPCsEvent.ScriptedCommandEvent(senderWorld, senderPos, sender.getCommandSenderName(), commandId, commandArgs);
+        EventHooks.onScriptedCommand(sender, event);
 
-            if (!event.replyMessage.isEmpty()) {
-                sendMessage(sender, event.replyMessage);
-            }
+        if (!event.replyMessage.isEmpty()) {
+            sendMessage(sender, event.replyMessage);
         }
     }
 }
diff --git a/src/main/java/noppes/npcs/EventHooks.java b/src/main/java/noppes/npcs/EventHooks.java
index 7a18879ab..9cb5b1669 100644
--- a/src/main/java/noppes/npcs/EventHooks.java
+++ b/src/main/java/noppes/npcs/EventHooks.java
@@ -2,6 +2,7 @@ package noppes.npcs;
 
 import cpw.mods.fml.common.eventhandler.Event;
 import kamkeel.npcs.network.packets.data.AchievementPacket;
+import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.item.EntityItem;
@@ -768,8 +769,12 @@ public class EventHooks {
         return false;
     }
 
-    public static boolean onScriptedCommand(EntityPlayer player, CustomNPCsEvent.ScriptedCommandEvent event) {
-        ScriptController.Instance.getPlayerScripts(player).callScript(EnumScriptType.SCRIPT_COMMAND, event);
+    public static boolean onScriptedCommand(ICommandSender sender, CustomNPCsEvent.ScriptedCommandEvent event) {
+        if (sender instanceof EntityPlayer) {
+            ScriptController.Instance.getPlayerScripts((EntityPlayer) sender).callScript(EnumScriptType.SCRIPT_COMMAND, event);
+        } else {
+            ScriptController.Instance.playerScripts.callScript(EnumScriptType.SCRIPT_COMMAND, event);
+        }
         return NpcAPI.EVENT_BUS.post(event);
     }