diff --git a/resource/plugin.yml b/resource/plugin.yml index dd54da3..7f486a8 100644 --- a/resource/plugin.yml +++ b/resource/plugin.yml @@ -1,4 +1,4 @@ -version: 3.16.0.0 +version: 3.16.0.1 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 aee9fa7..8b51704 100644 --- a/src/me/rockyhawk/commandpanels/CommandPanels.java +++ b/src/me/rockyhawk/commandpanels/CommandPanels.java @@ -256,7 +256,7 @@ public class CommandPanels extends JavaPlugin{ return new CommandPanelsAPI(JavaPlugin.getPlugin(CommandPanels.class)); } - public void setName(Panel panel, ItemStack renamed, String customName, List lore, Player p, Boolean usePlaceholders, Boolean useColours, Boolean hideAttributes) { + public ItemStack setName(Panel panel, ItemStack renamed, String customName, List lore, Player p, Boolean usePlaceholders, Boolean useColours, Boolean hideAttributes) { try { ItemMeta renamedMeta = renamed.getItemMeta(); //set cp placeholders @@ -276,23 +276,22 @@ public class CommandPanels extends JavaPlugin{ renamedMeta.setDisplayName(customName); } - List clore; + List re_lore; if (lore != null) { if(usePlaceholders && useColours){ - clore = tex.placeholdersList(panel, p, lore, true); + re_lore = tex.placeholdersList(panel, p, lore, true); }else if(usePlaceholders){ - clore = tex.placeholdersNoColour(panel,p, lore); + re_lore = tex.placeholdersNoColour(panel,p, lore); }else if(useColours){ - clore = tex.placeholdersList(panel, p, lore, false); + re_lore = tex.placeholdersList(panel, p, lore, false); }else{ - clore = lore; + re_lore = lore; } - renamedMeta.setLore(splitListWithEscape(clore)); + renamedMeta.setLore(splitListWithEscape(re_lore)); } renamed.setItemMeta(renamedMeta); - } catch (Exception ignored) { - } - + } catch (Exception ignored) {} + return renamed; } private void setupEconomy() { diff --git a/src/me/rockyhawk/commandpanels/classresources/placeholders/CreateText.java b/src/me/rockyhawk/commandpanels/classresources/placeholders/CreateText.java index cfa6aa5..c369492 100644 --- a/src/me/rockyhawk/commandpanels/classresources/placeholders/CreateText.java +++ b/src/me/rockyhawk/commandpanels/classresources/placeholders/CreateText.java @@ -61,17 +61,13 @@ public class CreateText { tempInt += 1; } } - }catch(Exception ignore){ - //this will be ignored as it is probably a null - return null; - } + }catch(Exception ignore){} int tempInt = 0; //change colour for(String temp : setpapi){ try { setpapi.set(tempInt, plugin.hex.translateHexColorCodes(ChatColor.translateAlternateColorCodes('&', temp))); - }catch(NullPointerException ignore){ - } + }catch(NullPointerException ignore){} tempInt += 1; } return setpapi; diff --git a/src/me/rockyhawk/commandpanels/classresources/placeholders/Placeholders.java b/src/me/rockyhawk/commandpanels/classresources/placeholders/Placeholders.java index fcc88ad..74f1692 100644 --- a/src/me/rockyhawk/commandpanels/classresources/placeholders/Placeholders.java +++ b/src/me/rockyhawk/commandpanels/classresources/placeholders/Placeholders.java @@ -50,12 +50,14 @@ public class Placeholders { List values = new ArrayList<>(); values.add(new String[]{plugin.config.getString("placeholders.primary.start"),plugin.config.getString("placeholders.primary.end")}); values.add(new String[]{plugin.config.getString("placeholders.secondary.start"),plugin.config.getString("placeholders.secondary.end")}); - if(panel.getConfig().isSet("placeholders")){ - if(panel.getConfig().isSet("placeholders.primary")){ - values.set(0,new String[]{panel.getConfig().getString("placeholders.primary.start"),panel.getConfig().getString("placeholders.primary.end")}); - } - if(panel.getConfig().isSet("placeholders.secondary")){ - values.set(1,new String[]{panel.getConfig().getString("placeholders.secondary.start"),panel.getConfig().getString("placeholders.secondary.end")}); + if(panel != null) { + if (panel.getConfig().isSet("placeholders")) { + if (panel.getConfig().isSet("placeholders.primary")) { + values.set(0, new String[]{panel.getConfig().getString("placeholders.primary.start"), panel.getConfig().getString("placeholders.primary.end")}); + } + if (panel.getConfig().isSet("placeholders.secondary")) { + values.set(1, new String[]{panel.getConfig().getString("placeholders.secondary.start"), panel.getConfig().getString("placeholders.secondary.end")}); + } } } if(primary){ diff --git a/src/me/rockyhawk/commandpanels/openwithitem/UtilsChestSortEvent.java b/src/me/rockyhawk/commandpanels/openwithitem/UtilsChestSortEvent.java index 36eef65..9a89534 100644 --- a/src/me/rockyhawk/commandpanels/openwithitem/UtilsChestSortEvent.java +++ b/src/me/rockyhawk/commandpanels/openwithitem/UtilsChestSortEvent.java @@ -1,6 +1,6 @@ package me.rockyhawk.commandpanels.openwithitem; -import de.jeff_media.chestsort.ChestSortEvent; +import de.jeff_media.chestsort.api.ChestSortEvent; import me.rockyhawk.commandpanels.CommandPanels; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener;