From f947025afad31669d22808d1cddd291b39ef86c8 Mon Sep 17 00:00:00 2001
From: JaTiTV <info.jatitv@gmail.com>
Date: Sat, 9 Jul 2022 17:25:59 +0200
Subject: [PATCH] 2.8.7 No Permission Lore, Function load fix

---
 CommandGUI V2/pom.xml                                         | 2 +-
 .../java/de/jatitv/commandguiv2/Spigot/gui/GuiBuilder.java    | 4 ++--
 .../de/jatitv/commandguiv2/Spigot/objects/Obj_Select.java     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CommandGUI V2/pom.xml b/CommandGUI V2/pom.xml
index 782ab67..b5b2414 100644
--- a/CommandGUI V2/pom.xml	
+++ b/CommandGUI V2/pom.xml	
@@ -6,7 +6,7 @@
 
     <groupId>net.t2code</groupId>
     <artifactId>CommandGUI_V2</artifactId>
-    <version>2.8.6</version>
+    <version>2.8.7</version>
     <packaging>jar</packaging>
 
     <name>CommandGUI</name>
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/gui/GuiBuilder.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/gui/GuiBuilder.java
index 1a8baed..a4c67ef 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/gui/GuiBuilder.java	
+++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/gui/GuiBuilder.java	
@@ -67,12 +67,12 @@ public class GuiBuilder {
         Function function = Main.functionHashMap.get(slot.function);
         if (Main.PaPi) {
             itemMeta.setDisplayName(Replace.replace(prefix, player, Placeholder.replace(function.name, player)));
-            if (!player.hasPermission(slot.permissionToUse) && function.noPermLoreEnable) {
+            if (slot.permission && !player.hasPermission(slot.permissionToUse) && function.noPermLoreEnable) {
                 itemMeta.setLore(Replace.replacePrice(prefix, player, Placeholder.replace(function.noPermLore, player), function.price + " " + SelectConfig.getCurrency()));
             } else itemMeta.setLore(Replace.replacePrice(prefix, player, Placeholder.replace(function.lore, player), function.price + " " + SelectConfig.getCurrency()));
         } else {
             itemMeta.setDisplayName(Replace.replace(prefix, Placeholder.replace(function.name, player)));
-            if (!player.hasPermission(slot.permissionToUse) && function.noPermLoreEnable) {
+            if (slot.permission && !player.hasPermission(slot.permissionToUse) && function.noPermLoreEnable) {
                 itemMeta.setLore(Replace.replacePrice(prefix, Placeholder.replace(function.noPermLore, player), function.price + " " + SelectConfig.getCurrency()));
             } else itemMeta.setLore(Replace.replacePrice(prefix, Placeholder.replace(function.lore, player), function.price + " " + SelectConfig.getCurrency()));
         }
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/objects/Obj_Select.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/objects/Obj_Select.java
index 1bdee43..ccf166c 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/objects/Obj_Select.java	
+++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/objects/Obj_Select.java	
@@ -101,7 +101,7 @@ public class Obj_Select {
         File[] fileArray = f.listFiles();
 
         for (File config : fileArray) {
-            if (config.getName().equals("functionDeclaration.yml")) return;
+            if (config.getName().equals("functionDeclaration.yml")) continue;
             String sub = config.getName().substring(config.getName().length() - 4);
             if (sub.equals(".yml")) {
                 YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(config);