Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-27 11:27:35 +01:00
Code Issues Projects Releases Wiki Activity

Add sender name to commands.yml replacement

Browse Source 
This allows you to use $sender in commands.yml definitions to make
commands that auto target self.
This commit is contained in:
Aikar 2015-07-22 18:50:41 -04:00
parent 7ec6dfa78b
commit 65a5fbb91a
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
paper-api/src/main/java/org/bukkit/command/FormattedCommandAlias.java
View File

@ -1,6 +1,9 @@
package org.bukkit.command;
import java.util.ArrayList;
import java.util.regex.Matcher; // Paper
import java.util.regex.Pattern; // Paper
import org.bukkit.Bukkit;
import org.jetbrains.annotations.NotNull;
@ -19,7 +22,7 @@ public class FormattedCommandAlias extends Command {
ArrayList<String> commands = new ArrayList<String>();
for (String formatString : formatStrings) {
try {
commands.add(buildCommand(formatString, args));
commands.add(buildCommand(sender, formatString, args)); // Paper
} catch (Throwable throwable) {
if (throwable instanceof IllegalArgumentException) {
sender.sendMessage(throwable.getMessage());
@ -37,7 +40,10 @@ public class FormattedCommandAlias extends Command {
return result;
}
private String buildCommand(@NotNull String formatString, @NotNull String[] args) {
private String buildCommand(@NotNull CommandSender sender, @NotNull String formatString, @NotNull String[] args) { // Paper
if (formatString.contains("$sender")) { // Paper
formatString = formatString.replaceAll(Pattern.quote("$sender"), Matcher.quoteReplacement(sender.getName())); // Paper
} // Paper
int index = formatString.indexOf('$');
while (index != -1) {
int start = index;