From d5149ad961141466fb50a83adc02c0e748008f42 Mon Sep 17 00:00:00 2001 From: TheLonelyWolf1 <42873246+TheLonelyWolf1@users.noreply.github.com> Date: Sat, 20 Nov 2021 13:06:32 +0100 Subject: [PATCH] Custom No-Permission Messages Add the option to have panel-only no-permission messages --- .../classresources/ExecuteOpenVoids.java | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/src/me/rockyhawk/commandpanels/classresources/ExecuteOpenVoids.java b/src/me/rockyhawk/commandpanels/classresources/ExecuteOpenVoids.java index cdf125d..4e3219a 100644 --- a/src/me/rockyhawk/commandpanels/classresources/ExecuteOpenVoids.java +++ b/src/me/rockyhawk/commandpanels/classresources/ExecuteOpenVoids.java @@ -36,15 +36,25 @@ public class ExecuteOpenVoids { panel.setConfig(YamlConfiguration.loadConfiguration(panel.getFile())); } if (!sender.hasPermission("commandpanel.panel." + panel.getConfig().getString("perm"))) { - sender.sendMessage(plugin.tex.colour(plugin.tag + plugin.config.getString("config.format.perms"))); - return; + if(!(panel.getConfig().getString("custom-messages.perms") == null)) { + sender.sendMessage(plugin.tex.colour(plugin.tag + panel.getConfig().getString("custom-messages.perms"))); + return; + }else { + sender.sendMessage(plugin.tex.colour(plugin.tag + plugin.config.getString("config.format.perms"))); + return; + } } //if the sender has OTHER perms, or if sendOpenedMessage is false, implying it is not for another person if(sender.hasPermission("commandpanel.other") || !openForOtherUser) { //check for disabled worlds if(!plugin.panelPerms.isPanelWorldEnabled(p,panel.getConfig())){ - sender.sendMessage(plugin.tex.colour(plugin.tag + plugin.config.getString("config.format.perms"))); - return; + if(!(panel.getConfig().getString("custom-messages.perms") == null)) { + sender.sendMessage(plugin.tex.colour(plugin.tag + panel.getConfig().getString("custom-messages.perms"))); + return; + }else { + sender.sendMessage(plugin.tex.colour(plugin.tag + plugin.config.getString("config.format.perms"))); + return; + } } if(position != PanelPosition.Top && !plugin.openPanels.hasPanelOpen(p.getName(),PanelPosition.Top)){ @@ -101,7 +111,13 @@ public class ExecuteOpenVoids { p.closeInventory(); } }else{ - sender.sendMessage(plugin.tex.colour(plugin.tag + plugin.config.getString("config.format.perms"))); + if(!(panel.getConfig().getString("custom-messages.perms") == null)) { + sender.sendMessage(plugin.tex.colour(plugin.tag + panel.getConfig().getString("custom-messages.perms"))); + return; + }else { + sender.sendMessage(plugin.tex.colour(plugin.tag + plugin.config.getString("config.format.perms"))); + return; + } } }