minor fixes

hostadam · Jan 3, 2025 · 2722ef8 · 2722ef8
1 parent 42bfd96
commit 2722ef8
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 17 deletions.
diff --git a/src/main/java/com/github/hostadam/menu/Menu.java b/src/main/java/com/github/hostadam/menu/Menu.java
@@ -34,8 +34,9 @@ public abstract class Menu {
 
     private int page = 1, maxPages = 1;
 
-    public Menu(JavaPlugin plugin, MenuTemplate template) {
+    public Menu(JavaPlugin plugin, Player player, MenuTemplate template) {
         this.plugin = plugin;
+        this.player = player;
         this.menuTemplate = template;
         this.size = template.getInventoryRows() * 9;
         this.inventory = Bukkit.createInventory(null, this.size, template.getInventoryTitle());
@@ -168,18 +169,21 @@ public boolean click(InventoryClickEvent event) {
         MenuItem button = this.buttons.get(event.getRawSlot());
         if(button != null) {
             event.setCancelled(true);
-            if(button.getClickEvent() != null) button.getClickEvent().accept(event);
-            if(button.isPaginated()) {
-                switch(button.getType()) {
-                    case NEXT_PAGE:
-                        this.nextPage();
-                        break;
-                    case PREVIOUS_PAGE:
-                        this.previousPage();
-                        break;
-                    case BACK_TO_MAIN_PAGE:
-                        this.mainPage();
-                        break;
+
+            if(button.getPermission().isEmpty() || this.player.hasPermission(button.getPermission())) {
+                if(button.getClickEvent() != null) button.getClickEvent().accept(event);
+                if(button.isPaginated()) {
+                    switch(button.getType()) {
+                        case NEXT_PAGE:
+                            this.nextPage();
+                            break;
+                        case PREVIOUS_PAGE:
+                            this.previousPage();
+                            break;
+                        case BACK_TO_MAIN_PAGE:
+                            this.mainPage();
+                            break;
+                    }
                 }
             }
         }

diff --git a/src/main/java/com/github/hostadam/utils/ItemBuilder.java b/src/main/java/com/github/hostadam/utils/ItemBuilder.java
@@ -174,6 +174,7 @@ public ItemStack build() {
     }
 
     public static ItemBuilder fromConfig(ConfigurationSection section) {
+        if(section == null) return null;
         Material material = Material.getMaterial(section.getString("material").toUpperCase());
         int amount = section.getInt("amount", 1);
         ItemBuilder builder = new ItemBuilder(material)

diff --git a/src/main/java/com/github/hostadam/utils/TimeUtils.java b/src/main/java/com/github/hostadam/utils/TimeUtils.java
@@ -62,10 +62,6 @@ public static String format(long duration) {
             return "Permanent";
         }
 
-        if(duration == -2) {
-            return "Seasonal";
-        }
-
         int sec = (int) (duration / 1000) % 60 ;
         int min = (int) ((duration / (1000*60)) % 60);
         int hour = (int) ((duration / (1000*60*60)) % 24);