Paper/Spigot-API-Patches/0024-Add-sender-name-to-commands.yml-replacement.patch

47 lines
2.0 KiB
Diff
Raw Normal View History

2019-04-23 06:47:07 +02:00
From 9de592f68b7fb6a7f83c8873216da8a771784ebd Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 22 Jul 2015 18:50:41 -0400
Subject: [PATCH] Add sender name to commands.yml replacement
This allows you to use $sender in commands.yml definitions to make
commands that auto target self.
diff --git a/src/main/java/org/bukkit/command/FormattedCommandAlias.java b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
2019-04-23 06:47:07 +02:00
index a6ad94ef..9d4f553c 100644
--- a/src/main/java/org/bukkit/command/FormattedCommandAlias.java
+++ b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
2019-04-23 06:47:07 +02:00
@@ -1,6 +1,9 @@
2017-11-08 17:13:57 +01:00
package org.bukkit.command;
import java.util.ArrayList;
+import java.util.regex.Matcher; // Paper
+import java.util.regex.Pattern; // Paper
2019-04-23 06:47:07 +02:00
+
import org.bukkit.Bukkit;
import org.jetbrains.annotations.NotNull;
2019-04-23 06:47:07 +02:00
@@ -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());
2019-04-23 06:47:07 +02:00
@@ -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
2017-11-08 17:13:57 +01:00
int index = formatString.indexOf('$');
while (index != -1) {
int start = index;
--
2.21.0