diff --git a/resource/plugin.yml b/resource/plugin.yml index 7f71288..55b7fcf 100644 --- a/resource/plugin.yml +++ b/resource/plugin.yml @@ -1,4 +1,4 @@ -version: 3.19.0.2 +version: 3.19.0.3 main: me.rockyhawk.commandpanels.CommandPanels name: CommandPanels author: RockyHawk diff --git a/src/me/rockyhawk/commandpanels/commandtags/CommandTags.java b/src/me/rockyhawk/commandpanels/commandtags/CommandTags.java index 276e297..2cbb1d2 100644 --- a/src/me/rockyhawk/commandpanels/commandtags/CommandTags.java +++ b/src/me/rockyhawk/commandpanels/commandtags/CommandTags.java @@ -201,7 +201,7 @@ public class CommandTags { } case "item-paywall=": { //if player uses item-paywall= [Material] [Amount] - //player can use item-paywall= [custom-item] + //player can use item-paywall= [custom-item] [Amount] List cont = new ArrayList<>(Arrays.asList(plugin.inventorySaver.getNormalInventory(p))); List remCont = new ArrayList<>(); String[] args = command.split("\\s"); @@ -226,6 +226,7 @@ public class CommandTags { ItemStack sellItem; if (Material.matchMaterial(args[1]) == null) { sellItem = plugin.itemCreate.makeCustomItemFromConfig(panel, PanelPosition.Top, panel.getConfig().getConfigurationSection("custom-item." + args[1]), p, true, true, false); + sellItem.setAmount(Integer.parseInt(args[2])); } else { sellItem = new ItemStack(Objects.requireNonNull(Material.matchMaterial(args[1])), Integer.parseInt(args[2])); } diff --git a/src/me/rockyhawk/commandpanels/openpanelsmanager/UtilsPanelsLoader.java b/src/me/rockyhawk/commandpanels/openpanelsmanager/UtilsPanelsLoader.java index b617be3..4b259fc 100644 --- a/src/me/rockyhawk/commandpanels/openpanelsmanager/UtilsPanelsLoader.java +++ b/src/me/rockyhawk/commandpanels/openpanelsmanager/UtilsPanelsLoader.java @@ -54,7 +54,10 @@ public class UtilsPanelsLoader implements Listener { public void run() { //end the old panel session and copy a new one plugin.openPanels.getOpenPanel(playerName,PanelPosition.Top).isOpen = false; - plugin.openPanels.getOpenPanel(playerName,PanelPosition.Top).copy().open(Bukkit.getPlayer(playerName), PanelPosition.Top); + Panel reopenedPanel = plugin.openPanels.getOpenPanel(playerName,PanelPosition.Top).copy(); + //re-add placeholders as they are not transferred in the Panel object + reopenedPanel.placeholders.keys = plugin.openPanels.getOpenPanel(playerName,PanelPosition.Top).placeholders.keys; + reopenedPanel.open(Bukkit.getPlayer(playerName), PanelPosition.Top); } }); return; diff --git a/src/me/rockyhawk/commandpanels/updater/Updater.java b/src/me/rockyhawk/commandpanels/updater/Updater.java index cebd21a..a7fea16 100644 --- a/src/me/rockyhawk/commandpanels/updater/Updater.java +++ b/src/me/rockyhawk/commandpanels/updater/Updater.java @@ -84,6 +84,8 @@ public class Updater implements Listener { HttpURLConnection connection; try { connection = (HttpURLConnection) new URL("https://raw.githubusercontent.com/rockyhawk64/CommandPanels/master/resource/plugin.yml").openConnection(); + connection.setConnectTimeout(5000); // 5 seconds + connection.setReadTimeout(5000); // 5 seconds connection.connect(); cachedLatestVersion = new BufferedReader(new InputStreamReader(connection.getInputStream())).readLine().split("\\s")[1]; connection.disconnect();