Skip to content

Support player placeholder variants and strip name prefix on reward claim #3

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

Open
iphonetips1 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support player placeholder variants and strip name prefix on reward claim #3

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
15 changes: 14 additions & 1 deletion src/main/java/com/artillexstudios/axrewards/guis/impl/RewardGui.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,14 @@ public void open() {
AxRewards.getDatabase().claimReward(player, reward);

Scheduler.get().run(scheduledTask -> {
String playerName = player.getName();
String strippedPlayerName = stripNamePrefix(playerName);
for (String command : reward.claimCommands()) {
command = command.replace("%player%", player.getName());
command = command
.replace("%player%", playerName == null ? "" : playerName)
.replace("%player_with_prefix%", playerName == null ? "" : playerName)
.replace("%player_without_prefix%", strippedPlayerName)
.replace("%player_uuid%", player.getUniqueId().toString());
Bukkit.dispatchCommand(Bukkit.getConsoleSender(), AxRewards.getPlaceholderParser().setPlaceholders(player, command));
}
for (Map<?, ?> map : reward.claimItems()) {
Expand Down Expand Up @@ -181,6 +187,13 @@ public static Set<RewardGui> getOpenMenus() {
return openMenus;
}

private static String stripNamePrefix(String playerName) {
if (playerName == null) return "";
if (!playerName.startsWith(".")) return playerName;
if (playerName.length() == 1) return playerName;
return playerName.substring(1);
}

private static Map<Object, Object> normalizeItemMap(Map<?, ?> original) {
final Map<Object, Object> copy = new LinkedHashMap<>();
for (Map.Entry<?, ?> entry : original.entrySet()) {
Expand Down
Loading