Skip to content

Parse PAPI placeholders for reward commands #269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BenCodez merged 1 commit into from
Jun 6, 2026
Merged

Parse PAPI placeholders for reward commands #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions AdvancedCore/src/main/java/com/bencodez/advancedcore/api/messages/PlaceholderUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,14 @@ public static ArrayList<String> replacePlaceHolders(ArrayList<String> list, Play
return newList;
}

public static ArrayList<String> replacePlaceHolders(OfflinePlayer player, ArrayList<String> list) {
ArrayList<String> newList = new ArrayList<>();
for (int i = 0; i < list.size(); i++) {
newList.add(replacePlaceHolders(player, list.get(i)));
}
return newList;
}

public static String replacePlaceHolders(OfflinePlayer player, String text) {
if (player == null) {
return text;
Expand Down
26 changes: 15 additions & 11 deletions AdvancedCore/src/main/java/com/bencodez/advancedcore/api/misc/MiscUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,10 +174,11 @@ public void executeConsoleCommands(final Player player, final ArrayList<String>
final HashMap<String, String> placeholders, boolean stagger) {
if (cmds != null && !cmds.isEmpty()) {
placeholders.put("player", player.getName());
final ArrayList<String> commands = PlaceholderUtils.replaceJavascript(player,
PlaceholderUtils.replacePlaceHolder(cmds, placeholders));
ArrayList<String> commands = PlaceholderUtils.replacePlaceHolder(cmds, placeholders);
commands = PlaceholderUtils.replacePlaceHolders(commands, player);
final ArrayList<String> finalCommands = PlaceholderUtils.replaceJavascript(player, commands);
int tick = 0;
for (final String cmd : commands) {
for (final String cmd : finalCommands) {
plugin.debug("Executing console command: " + cmd);
runConsoleCommand(cmd, tick, stagger);
}
Expand All @@ -187,15 +188,16 @@ public void executeConsoleCommands(final Player player, final ArrayList<String>

public void executeConsoleCommands(Player player, String command, HashMap<String, String> placeholders) {
if (command != null && !command.isEmpty()) {
final String cmd = PlaceholderUtils.replaceJavascript(player,
PlaceholderUtils.replacePlaceHolder(command, placeholders));
String cmd = PlaceholderUtils.replacePlaceHolder(command, placeholders);
cmd = PlaceholderUtils.replacePlaceHolders(player, cmd);
final String finalCommand = PlaceholderUtils.replaceJavascript(player, cmd);

plugin.debug("Executing console command: " + command);
plugin.getBukkitScheduler().executeOrScheduleSync(plugin, new Runnable() {

@Override
public void run() {
Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), cmd);
Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), finalCommand);
}

}, player);
Expand All @@ -209,11 +211,11 @@ public void executeConsoleCommands(final String playerName, final ArrayList<Stri
if (cmds != null && !cmds.isEmpty()) {
placeholders.put("player", playerName);
OfflinePlayer p = Bukkit.getOfflinePlayer(playerName);
ArrayList<String> commands1 = cmds;
ArrayList<String> commands = PlaceholderUtils.replacePlaceHolder(cmds, placeholders);
if (p != null) {
commands1 = PlaceholderUtils.replaceJavascript(p, commands1);
commands = PlaceholderUtils.replacePlaceHolders(p, commands);
commands = PlaceholderUtils.replaceJavascript(p, commands);
}
final ArrayList<String> commands = PlaceholderUtils.replacePlaceHolder(commands1, placeholders);
int tick = 0;
for (final String cmd : commands) {
plugin.debug("Executing console command: " + cmd);
Expand All @@ -224,14 +226,16 @@ public void executeConsoleCommands(final String playerName, final ArrayList<Stri

public void executeConsoleCommands(String playerName, String command, HashMap<String, String> placeholders) {
if (command != null && !command.isEmpty()) {
Player p = Bukkit.getPlayer(playerName);
OfflinePlayer p = Bukkit.getOfflinePlayer(playerName);
command = PlaceholderUtils.replacePlaceHolder(command, placeholders);
if (p != null) {
command = PlaceholderUtils.replacePlaceHolders(p, command);
command = PlaceholderUtils.replaceJavascript(p, command);
}
if (command.startsWith("/")) {
command.replaceFirst("/", "");
}
final String cmd = PlaceholderUtils.replacePlaceHolder(command, placeholders);
final String cmd = command;

plugin.debug("Executing console command: " + command);
plugin.getBukkitScheduler().executeOrScheduleSync(plugin, new Runnable() {
Expand Down
Loading