Merge pull request #98 from HelpChat/issue/80

Issue/80
HelpChat · Jun 18, 2024 · 2ed4b24 · 2ed4b24
2 parents ac2700a + d1b4f60
commit 2ed4b24
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/src/main/java/com/extendedclip/deluxemenus/action/ClickActionTask.java b/src/main/java/com/extendedclip/deluxemenus/action/ClickActionTask.java
@@ -61,14 +61,18 @@ public void run() {
         }
 
         final Optional<MenuHolder> holder = Menu.getMenuHolder(player);
+        final Player target = holder.isPresent() && holder.get().getPlaceholderPlayer() != null
+                ? holder.get().getPlaceholderPlayer()
+                : player;
+
+
         final String executable = StringUtils.replacePlaceholdersAndArguments(
                 this.exec,
                 this.arguments,
-                player,
+                target,
                 this.parsePlaceholdersInArguments,
                 this.parsePlaceholdersAfterArguments);
 
-
         switch (actionType) {
             case META:
                 if (!VersionHelper.IS_PDC_VERSION || DeluxeMenus.getInstance().getPersistentMetaHandler() == null) {
@@ -413,14 +417,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;