Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-29 22:23:59 +01:00
Code Issues Projects Releases Wiki Activity

Fix say in /npc command

Browse Source
This commit is contained in:
fullwall 2022-06-30 16:10:16 +08:00
parent 58da8489e4
commit 55f8a1f75c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -474,8 +474,8 @@ public class CommandTrait extends Trait {
if (command.startsWith("say")) { if (command.startsWith("say")) {
cmd = "npc speak " + command.replaceFirst("say", "").trim() + " --target <p>"; cmd = "npc speak " + command.replaceFirst("say", "").trim() + " --target <p>";
} }
if ((command.startsWith("npc ") || command.startsWith("waypoints ") || command.startsWith("wp ")) if ((cmd.startsWith("npc ") || cmd.startsWith("waypoints ") || cmd.startsWith("wp "))
&& !command.contains("--id ")) { && !cmd.contains("--id ")) {
cmd += " --id <id>"; cmd += " --id <id>";
} }
String interpolatedCommand = Placeholders.replace(cmd, clicker, npc); String interpolatedCommand = Placeholders.replace(cmd, clicker, npc);