Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-09-28 15:17:43 +02:00
Code Issues Projects Releases Wiki Activity

Add 'say' option to /npc command and add the NPC id for /npc commands

Browse Source
This commit is contained in:
fullwall 2022-06-25 16:47:13 +08:00
parent 36cbef81a7
commit 1cdeda5d5d
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main/src/main/java/net/citizensnpcs/commands/NPCCommands.java
View File

@ -2399,8 +2399,8 @@ public class NPCCommands {
@Command(
aliases = { "npc" },
usage = "speak message to speak --target npcid|player_name --type vocal_type",
desc = "Uses the NPCs SpeechController to talk",
usage = "speak [message] --target [npcid|player name] (--type vocal_type)",
desc = "Says a message from the NPC",
modifiers = { "speak" },
min = 2,
permission = "citizens.npc.speak")

10
main/src/main/java/net/citizensnpcs/trait/CommandTrait.java
View File

@ -470,7 +470,15 @@ public class CommandTrait extends Trait {
}
public void run(NPC npc, Player clicker) {
String interpolatedCommand = Placeholders.replace(command, clicker, npc);
String cmd = command;
if (command.startsWith("say")) {
cmd = "npc speak " + command.replaceFirst("say", "").trim() + " --target <p>";
}
if ((command.startsWith("npc") || command.startsWith("waypoints") || command.startsWith("wp"))
&& !command.contains("--id <id>")) {
cmd += " --id <id>";
}
String interpolatedCommand = Placeholders.replace(cmd, clicker, npc);
if (Messaging.isDebugging()) {
Messaging.debug(
"Running command " + interpolatedCommand + " on NPC " + npc.getId() + " clicker " + clicker);