diff --git a/resource/plugin.yml b/resource/plugin.yml index 689f286..d17417e 100644 --- a/resource/plugin.yml +++ b/resource/plugin.yml @@ -1,4 +1,4 @@ -version: 3.17.1.5 +version: 3.17.2.0 main: me.rockyhawk.commandpanels.CommandPanels name: CommandPanels author: RockyHawk diff --git a/src/me/rockyhawk/commandpanels/CommandPanels.java b/src/me/rockyhawk/commandpanels/CommandPanels.java index 5c28918..5b6d9a8 100644 --- a/src/me/rockyhawk/commandpanels/CommandPanels.java +++ b/src/me/rockyhawk/commandpanels/CommandPanels.java @@ -68,6 +68,7 @@ import java.io.InputStream; import java.io.Reader; import java.util.*; import java.util.concurrent.Callable; +import java.util.stream.Collectors; public class CommandPanels extends JavaPlugin{ public YamlConfiguration config; @@ -361,7 +362,7 @@ public class CommandPanels extends JavaPlugin{ //check for duplicate panel names public boolean checkDuplicatePanel(CommandSender sender){ - ArrayList apanels = new ArrayList<>(); + List apanels = new ArrayList<>(); for(Panel panel : panelList){ apanels.add(panel.getName()); } diff --git a/src/me/rockyhawk/commandpanels/api/CommandPanelsAPI.java b/src/me/rockyhawk/commandpanels/api/CommandPanelsAPI.java index 44f6ba8..091809e 100644 --- a/src/me/rockyhawk/commandpanels/api/CommandPanelsAPI.java +++ b/src/me/rockyhawk/commandpanels/api/CommandPanelsAPI.java @@ -12,7 +12,7 @@ import java.io.IOException; import java.util.List; public class CommandPanelsAPI { - CommandPanels plugin; + public CommandPanels plugin; public CommandPanelsAPI(CommandPanels pl) { this.plugin = pl; } diff --git a/src/me/rockyhawk/commandpanels/commandtags/CommandTags.java b/src/me/rockyhawk/commandpanels/commandtags/CommandTags.java index a354843..bead1f0 100644 --- a/src/me/rockyhawk/commandpanels/commandtags/CommandTags.java +++ b/src/me/rockyhawk/commandpanels/commandtags/CommandTags.java @@ -136,8 +136,10 @@ public class CommandTags { } @SuppressWarnings("deprecation") - public PaywallOutput commandPayWall(Panel panel, Player p, String command) { //return 0 means no funds, 1 is they passed and 2 means paywall is not this command + public PaywallOutput commandPayWall(Panel panel, Player p, String rawCommand) { //return 0 means no funds, 1 is they passed and 2 means paywall is not this command String tag = plugin.config.getString("config.format.tag") + " "; + //create new instance of command but with placeholders parsed + String command = plugin.tex.placeholders(panel,PanelPosition.Top,p,rawCommand); switch(command.split("\\s")[0]){ case "paywall=": { //if player uses paywall= [price]