v3.13.2

resource/plugin.yml

@@ -1,4 +1,4 @@
-version: 3.13.1
+version: 3.13.2
 main: me.rockyhawk.commandpanels.CommandPanels
 name: CommandPanels
 author: RockyHawk

src/me/rockyhawk/commandpanels/CommandPanels.java

@@ -501,7 +501,7 @@ public class CommandPanels extends JavaPlugin {
             p.sendMessage(ChatColor.GOLD + "/cpr " + ChatColor.WHITE + "Reloads plugin config.");
         }
         if (p.hasPermission("commandpanel.addons")) {
-            p.sendMessage(ChatColor.GOLD + "/cpa " + ChatColor.WHITE + "View downloadable addons for CommandPanels.");
+            p.sendMessage(ChatColor.GOLD + "/cpa " + ChatColor.WHITE + "View downloadable panels for CommandPanels.");
         }
         p.sendMessage(ChatColor.GOLD + "/cpc " + ChatColor.WHITE + "Close current GUI.");
         if (p.hasPermission("commandpanel.generate")) {

src/me/rockyhawk/commandpanels/commands/Commandpanelresources.java

@@ -20,12 +20,11 @@ public class Commandpanelresources implements CommandExecutor {
                 //version command
                 sender.sendMessage(plugin.papi(tag));
                 sender.sendMessage(ChatColor.GREEN + "Version " + ChatColor.GRAY + plugin.getDescription().getVersion());
-                sender.sendMessage(ChatColor.GREEN + "Find Addons " + ChatColor.GRAY + "https://commandpanels.org/resources/");
+                sender.sendMessage(ChatColor.GREEN + "Find Panels " + ChatColor.GRAY + "https://commandpanels.org/resources/");
-                return true;
             }else{
                 sender.sendMessage(plugin.papi(tag + plugin.config.getString("config.format.perms")));
-                return true;
             }
+            return true;
         }
         sender.sendMessage(plugin.papi(tag + ChatColor.RED + "Usage: /cpa"));
         return true;

src/me/rockyhawk/commandpanels/commands/Commandpanelsdebug.java

@@ -27,11 +27,10 @@ public class Commandpanelsdebug implements CommandExecutor {
                 }else{
                     sender.sendMessage(plugin.papi(tag + ChatColor.RED + "Usage: /cpd"));
                 }
-                return true;
             }else{
                 sender.sendMessage(plugin.papi(tag + plugin.config.getString("config.format.perms")));
-                return true;
             }
+            return true;
         }
         sender.sendMessage(plugin.papi(tag + ChatColor.RED + "Usage: /cpd"));
         return true;

src/me/rockyhawk/commandpanels/commands/Commandpanelslist.java

@@ -79,11 +79,10 @@ public class Commandpanelslist implements CommandExecutor {
                         sender.sendMessage(ChatColor.GREEN + "- " + apanels.get(f));
                     }
                 }
-                return true;
             }else{
                 sender.sendMessage(plugin.papi(tag + plugin.config.getString("config.format.perms")));
-                return true;
             }
+            return true;
         }
         sender.sendMessage(plugin.papi(tag + ChatColor.RED + "Usage: /cpl"));
         return true;

src/me/rockyhawk/commandpanels/commands/Commandpanelsreload.java

@@ -30,11 +30,10 @@ public class Commandpanelsreload implements CommandExecutor {
 
                 tag = plugin.config.getString("config.format.tag") + " ";
                 sender.sendMessage(plugin.papi(tag + plugin.config.getString("config.format.reload")));
-                return true;
             }else{
                 sender.sendMessage(plugin.papi(tag + plugin.config.getString("config.format.perms")));
-                return true;
             }
+            return true;
         }
         sender.sendMessage(plugin.papi(tag + ChatColor.RED + "Usage: /cpr"));
         return true;

src/me/rockyhawk/commandpanels/commands/Commandpanelversion.java

@@ -24,11 +24,10 @@ public class Commandpanelversion implements CommandExecutor {
                 sender.sendMessage(ChatColor.GRAY + "-------------------");
                 sender.sendMessage(ChatColor.GREEN + "Developer " + ChatColor.GRAY + "RockyHawk");
                 sender.sendMessage(ChatColor.GREEN + "Command " + ChatColor.GRAY + "/cp");
-                return true;
             }else{
                 sender.sendMessage(plugin.papi(tag + plugin.config.getString("config.format.perms")));
-                return true;
             }
+            return true;
         }
         sender.sendMessage(plugin.papi(tag + ChatColor.RED + "Usage: /cpv"));
         return true;

src/me/rockyhawk/commandpanels/openpanelsmanager/OpenGUI.java

@@ -107,10 +107,13 @@ public class OpenGUI {
                     if(!item.equals("")) {
                         for (int f = 0; item.split("\\s").length - 1 >= f; ++f) {
                             if (Integer.parseInt(item.split("\\s")[f]) == c) {
+                                //check to ensure slot is empty
+                                if(i.getItem(f) == null){
                                     found = true;
                                 }
                             }
                         }
+                    }
                     if (!found) {
                         ItemStack empty;
                         try {
@@ -134,11 +137,13 @@ public class OpenGUI {
                         empty.setItemMeta(renamedMeta);
                         if (onOpen != 3) {
                             //only place empty items if not editing
+                            if(i.getItem(c) == null) {
                                 i.setItem(c, empty);
                             }
                         }
                     }
                 }
+            }
             if (onOpen == 1 || onOpen == 3) {
                 //onOpen 1 is default and 3 is for the editor
                 p.openInventory(i);