57dd397155
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: b999860d SPIGOT-2304: Add LootGenerateEvent CraftBukkit Changes: 77fd87e4 SPIGOT-2304: Implement LootGenerateEvent a1a705ee SPIGOT-5566: Doused campfires & fires should call EntityChangeBlockEvent 41712edd SPIGOT-5707: PersistentDataHolder not Persistent on API dropped Item
47 lines
2 KiB
Diff
47 lines
2 KiB
Diff
From 76eaf0d523ba97558aa23fd1b744d9e70c9978d4 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
|
|
index a6ad94ef9..9d4f553c0 100644
|
|
--- a/src/main/java/org/bukkit/command/FormattedCommandAlias.java
|
|
+++ b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
|
|
@@ -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;
|
|
--
|
|
2.26.2
|
|
|