Allow /npc mount --onnpc to work in console

CitizensDev · Mar 19, 2018 · f8a8a19 · f8a8a19
1 parent f03a376
commit f8a8a19
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java b/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java
@@ -909,7 +909,7 @@ public void minecart(CommandContext args, CommandSender sender, NPC npc) throws
             min = 1,
             max = 1,
             permission = "citizens.npc.controllable")
-    public void mount(CommandContext args, Player player, NPC npc) throws CommandException {
+    public void mount(CommandContext args, CommandSender sender, NPC npc) throws CommandException {
         if (args.hasValueFlag("onnpc")) {
             NPC mount;
             try {
@@ -929,9 +929,13 @@ public void mount(CommandContext args, Player player, NPC npc) throws CommandExc
         }
         boolean enabled = npc.hasTrait(Controllable.class) && npc.getTrait(Controllable.class).isEnabled();
         if (!enabled) {
-            Messaging.sendTr(player, Messages.NPC_NOT_CONTROLLABLE, npc.getName());
+            Messaging.sendTr(sender, Messages.NPC_NOT_CONTROLLABLE, npc.getName());
             return;
         }
+        if (!(sender instanceof Player)) {
+            throw new CommandException(CommandMessages.MUST_BE_INGAME);
+        }
+        Player player = (Player) sender;
         boolean success = npc.getTrait(Controllable.class).mount(player);
         if (!success) {
             Messaging.sendTr(player, Messages.FAILED_TO_MOUNT_NPC, npc.getName());