From 238e1effdb2f5c14292547059022389ebbb66f4d Mon Sep 17 00:00:00 2001 From: Mitchell Simpson Date: Wed, 31 Jul 2019 13:22:53 +0000 Subject: [PATCH 1/4] Update CommandManager.java - Fixed locale function to correctly return "event.general.nopermission" message. --- src/main/java/com/songoda/epicheads/command/CommandManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/songoda/epicheads/command/CommandManager.java b/src/main/java/com/songoda/epicheads/command/CommandManager.java index ae4a9b3..863717e 100644 --- a/src/main/java/com/songoda/epicheads/command/CommandManager.java +++ b/src/main/java/com/songoda/epicheads/command/CommandManager.java @@ -84,7 +84,7 @@ public class CommandManager implements CommandExecutor { } return; } - instance.getLocale().newMessage("event.general.nopermission").sendPrefixedMessage(sender); + instance.getLocale().getMessage("event.general.nopermission").sendPrefixedMessage(sender); } public List getCommands() { From 1a2ce3c4b4f32bd7a308a0650045f5893bde11a8 Mon Sep 17 00:00:00 2001 From: Lilac Date: Fri, 2 Aug 2019 20:55:19 +0100 Subject: [PATCH 2/4] Fixed NPE --- src/main/java/com/songoda/epicheads/command/CommandManager.java | 2 +- .../com/songoda/epicheads/utils/settings/SettingsManager.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/songoda/epicheads/command/CommandManager.java b/src/main/java/com/songoda/epicheads/command/CommandManager.java index ae4a9b3..863717e 100644 --- a/src/main/java/com/songoda/epicheads/command/CommandManager.java +++ b/src/main/java/com/songoda/epicheads/command/CommandManager.java @@ -84,7 +84,7 @@ public class CommandManager implements CommandExecutor { } return; } - instance.getLocale().newMessage("event.general.nopermission").sendPrefixedMessage(sender); + instance.getLocale().getMessage("event.general.nopermission").sendPrefixedMessage(sender); } public List getCommands() { diff --git a/src/main/java/com/songoda/epicheads/utils/settings/SettingsManager.java b/src/main/java/com/songoda/epicheads/utils/settings/SettingsManager.java index 3147bce..6837a09 100644 --- a/src/main/java/com/songoda/epicheads/utils/settings/SettingsManager.java +++ b/src/main/java/com/songoda/epicheads/utils/settings/SettingsManager.java @@ -11,6 +11,7 @@ import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.inventory.InventoryClickEvent; +import org.bukkit.event.inventory.InventoryType; import org.bukkit.event.player.AsyncPlayerChatEvent; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; @@ -35,6 +36,7 @@ public class SettingsManager implements Listener { @EventHandler public void onInventoryClick(InventoryClickEvent event) { + if (event.getView().getType() != InventoryType.CHEST) return; ItemStack clickedItem = event.getCurrentItem(); if (event.getInventory() != event.getWhoClicked().getOpenInventory().getTopInventory() From 0adbae5f7a36de7d8680e674c51822f02eb659a8 Mon Sep 17 00:00:00 2001 From: Lilac Date: Fri, 2 Aug 2019 21:06:08 +0100 Subject: [PATCH 3/4] Version. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 30f8737..839dd50 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ stages: variables: name: "EpicHeads" path: "/builds/$CI_PROJECT_PATH" - version: "3.0.17" + version: "3.0.18" build: stage: build From 6f395ef3cfcd0bd7bc54ddfb254b655632184f48 Mon Sep 17 00:00:00 2001 From: Mister Spock Date: Fri, 9 Aug 2019 14:42:49 +0000 Subject: [PATCH 4/4] Fix creating empty lore when lore list is empty --- src/main/java/com/songoda/epicheads/utils/Methods.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/songoda/epicheads/utils/Methods.java b/src/main/java/com/songoda/epicheads/utils/Methods.java index 1252db7..c4a39bb 100644 --- a/src/main/java/com/songoda/epicheads/utils/Methods.java +++ b/src/main/java/com/songoda/epicheads/utils/Methods.java @@ -105,8 +105,9 @@ public class Methods { meta.setDisplayName(formatText(Setting.ITEM_TOKEN_NAME.getString())); List lore = new ArrayList<>(); for (String line : Setting.ITEM_TOKEN_LORE.getStringList()) - lore.add(formatText(line)); - meta.setLore(lore); + if (!line.equals("")) + lore.add(formatText(line)); + if (lore != null) meta.setLore(lore); itemStack.setItemMeta(meta); return itemStack; }