Skip to content
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

Jump to bottom

Issue/80 #98

Merged
merged 4 commits into from
Jun 18, 2024
Merged

Issue/80 #98

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fce0e81
Target set with `-p:` argument in `/dm open` command ignored in actio…
BlitzOffline May 25, 2024
4f2490c
Merge branch 'refs/heads/cleanup' into issue/80
BlitzOffline May 25, 2024
b059663
Merge branch 'refs/heads/main' into issue/80
BlitzOffline Jun 18, 2024
d1b4f60
Merge branch 'refs/heads/main' into issue/80
BlitzOffline Jun 18, 2024
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
14 changes: 9 additions & 5 deletions src/main/java/com/extendedclip/deluxemenus/action/ClickActionTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,12 @@ public void run() {
}

final Optional<MenuHolder> holder = Menu.getMenuHolder(player);
final String executable = StringUtils.replacePlaceholdersAndArguments(this.exec, this.arguments, player, this.parsePlaceholdersInArguments);

final Player target = holder.isPresent() && holder.get().getPlaceholderPlayer() != null
? holder.get().getPlaceholderPlayer()
: player;

final String executable = StringUtils.replacePlaceholdersAndArguments(this.exec, this.arguments, target, this.parsePlaceholdersInArguments);

switch (actionType) {
case META:
Expand Down Expand Up @@ -405,14 +409,14 @@ public void run() {

switch (actionType) {
case BROADCAST_SOUND:
for (final Player target : Bukkit.getOnlinePlayers()) {
target.playSound(target.getLocation(), sound, volume, pitch);
for (final Player broadcastTarget : Bukkit.getOnlinePlayers()) {
broadcastTarget.playSound(broadcastTarget.getLocation(), sound, volume, pitch);
}
break;

case BROADCAST_WORLD_SOUND:
for (final Player target : player.getWorld().getPlayers()) {
target.playSound(target.getLocation(), sound, volume, pitch);
for (final Player broadcastTarget : player.getWorld().getPlayers()) {
broadcastTarget.playSound(broadcastTarget.getLocation(), sound, volume, pitch);
}
break;

Expand Down