Upstream/EpicHeads
1
0
Fork 0
mirror of https://github.com/songoda/EpicHeads.git synced 2024-11-25 20:16:14 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/development' into development

Browse Source
This commit is contained in:
Brianna 2019-08-19 13:13:12 -04:00
commit bffa0f8f55
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/songoda/epicheads/command/CommandManager.java
View File

@ -83,7 +83,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<AbstractCommand> getCommands() {

5
src/main/java/com/songoda/epicheads/utils/Methods.java
View File

@ -105,8 +105,9 @@ public class Methods {
meta.setDisplayName(formatText(Setting.ITEM_TOKEN_NAME.getString()));
List<String> 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;
}

2
src/main/java/com/songoda/epicheads/utils/settings/SettingsManager.java
View File

@ -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()