From ccdb7b8d92ed34f193fb70462e6e6677f09c2ada Mon Sep 17 00:00:00 2001
From: fullwall <fullwall25@gmail.com>
Date: Tue, 17 Sep 2019 19:48:21 +0800
Subject: [PATCH] Add explanatory message for /npc glowing --color

---
 main/src/main/java/net/citizensnpcs/commands/NPCCommands.java | 2 +-
 main/src/main/java/net/citizensnpcs/util/Messages.java        | 1 +
 main/src/main/resources/messages_en.properties                | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java b/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java
index a909002d0..160d113de 100644
--- a/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java
+++ b/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java
@@ -587,7 +587,7 @@ public class NPCCommands {
         if (args.hasValueFlag("color")) {
             ChatColor chatColor = Util.matchEnum(ChatColor.values(), args.getFlag("color"));
             if (!(npc.getEntity() instanceof Player))
-                throw new CommandException();
+                throw new CommandException(Messages.GLOWING_COLOR_PLAYER_ONLY);
             npc.getTrait(ScoreboardTrait.class).setColor(chatColor);
             Messaging.sendTr(sender, Messages.GLOWING_COLOR_SET, npc.getName(),
                     chatColor == null ? ChatColor.WHITE + "white" : chatColor + Util.prettyEnum(chatColor));
diff --git a/main/src/main/java/net/citizensnpcs/util/Messages.java b/main/src/main/java/net/citizensnpcs/util/Messages.java
index a69e4a46c..6e35aff0e 100644
--- a/main/src/main/java/net/citizensnpcs/util/Messages.java
+++ b/main/src/main/java/net/citizensnpcs/util/Messages.java
@@ -101,6 +101,7 @@ public class Messages {
     public static final String GAMEMODE_DESCRIBE = "citizens.commands.npc.gamemode.describe";
     public static final String GAMEMODE_INVALID = "citizens.commands.npc.gamemode.invalid";
     public static final String GAMEMODE_SET = "citizens.commands.npc.gamemode.set";
+    public static final String GLOWING_COLOR_PLAYER_ONLY = "citizens.commands.npc.glowing.player-only";
     public static final String GLOWING_COLOR_SET = "citizens.commands.npc.glowing.color-set";
     public static final String GLOWING_SET = "citizens.commands.npc.glowing.set";
     public static final String GLOWING_UNSET = "citizens.commands.npc.glowing.unset";
diff --git a/main/src/main/resources/messages_en.properties b/main/src/main/resources/messages_en.properties
index ed6c45ae3..4982a5337 100644
--- a/main/src/main/resources/messages_en.properties
+++ b/main/src/main/resources/messages_en.properties
@@ -61,6 +61,7 @@ citizens.commands.npc.gamemode.set=Gamemode set to [[{0}]].
 citizens.commands.npc.gravity.disabled=Gravity [[disabled]].
 citizens.commands.npc.gravity.enabled=Gravity [[enabled]].
 citizens.commands.npc.glowing.set=[[{0}]] is now glowing.
+citizens.commands.npc.glowing.player-only=Glowing color can only be changed for player-type NPCs.
 citizens.commands.npc.glowing.unset=[[{0}]] is no longer glowing.
 citizens.commands.npc.glowing.color-set=[[{0}]]''s glowing color set to {1}]].
 citizens.commands.npc.guardian.elder-unset=[[{0}]] is no longer an elder guardian.