Fix issue with conditional items and rewards in VoteGUI

BenCodez · Apr 13, 2024 · 4f2caf6 · 4f2caf6
1 parent 8b17e43
commit 4f2caf6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/VotingPlugin/Resources/GUI.yml b/VotingPlugin/Resources/GUI.yml
@@ -71,7 +71,7 @@ CHEST:
         Name: '&4Vote Shop'
         Lore:
         - '&aYou currently have %points% points'
-    # 'ExtraName' below is an identifier, can be whatever
+    # 'ExtraItem' below is an identifier, can be whatever
     # ExtraItem:
       # Item:
         # Material: 'DIRT'

diff --git a/VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteGUI.java b/VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteGUI.java
@@ -162,13 +162,19 @@ public void run() {
 					} else {
 						plugin.getCommandLoader().processSlotClick(player, user, slot);
 					}
+					String prefix = "";
+					if (event.getButton().getBuilder().isConditional()) {
+						prefix = "Item.";
+					}
 
-					if (plugin.getRewardHandler().hasRewards(plugin.getGui().getData(), plugin.getGui()
-							.getChestVoteGUISlotRewardsPath(slot, event.getButton().getLastRewardsPath(player)))) {
-						plugin.getRewardHandler().giveReward(plugin.getVotingPluginUserManager().getVotingPluginUser(player),
+					if (plugin.getRewardHandler().hasRewards(plugin.getGui().getData(),
+							plugin.getGui().getChestVoteGUISlotRewardsPath(slot,
+									prefix + event.getButton().getLastRewardsPath(player)))) {
+						plugin.getRewardHandler().giveReward(
+								plugin.getVotingPluginUserManager().getVotingPluginUser(player),
 								plugin.getGui().getData(),
 								plugin.getGui().getChestVoteGUISlotRewardsPath(slot,
-										event.getButton().getLastRewardsPath(player)),
+										prefix + event.getButton().getLastRewardsPath(player)),
 								new RewardOptions().addPlaceholder("identifier", slot));
 					}
 				}