From e4580730bca15a07a3673dc6a5b05472198c9f19 Mon Sep 17 00:00:00 2001 From: OfficialDonut Date: Thu, 13 Feb 2020 23:40:20 -0500 Subject: [PATCH] Fix prefix & suffix commands --- .../AsVaidas/LuckPemsGUI/groups/Prefix.java | 5 +++-- .../AsVaidas/LuckPemsGUI/groups/Suffix.java | 5 +++-- .../me/AsVaidas/LuckPemsGUI/users/Prefix.java | 19 ++++++++++++++----- .../me/AsVaidas/LuckPemsGUI/users/Suffix.java | 19 ++++++++++++++----- 4 files changed, 34 insertions(+), 14 deletions(-) diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Prefix.java b/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Prefix.java index edd725f..194c82b 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Prefix.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Prefix.java @@ -154,10 +154,11 @@ public void onInventoryClickEvent(InventoryClickEvent e) { if (!permission.isPrefix()) continue; if (sk == id) { if (Main.plugin.getConfig().getBoolean("UseLuckPerms5.Enabled")) { + Map.Entry prefix = permission.getPrefix(); if (permission.isTemporary()) - Tools.sendCommand(p, "lp group " + g.getName() + " meta unsettemp " + '"' + permission.getPermission() + '"' + " " + Tools.contextConverter(permission.getFullContexts())); + Tools.sendCommand(p, "lp group " + g.getName() + " meta removetempprefix " + prefix.getKey() + " " + '"' + prefix.getValue() + '"' + " " + Tools.contextConverter(permission.getFullContexts())); else - Tools.sendCommand(p, "lp group " + g.getName() + " meta unset " + '"' + permission.getPermission() + '"' + " " + Tools.contextConverter(permission.getFullContexts())); + Tools.sendCommand(p, "lp group " + g.getName() + " meta removeprefix " + prefix.getKey() + " " + '"' + prefix.getValue() + '"' + " " + Tools.contextConverter(permission.getFullContexts())); break; } else { if (permission.isTemporary()) diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Suffix.java b/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Suffix.java index 663c0c4..03eda0e 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Suffix.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/groups/Suffix.java @@ -155,10 +155,11 @@ public void onInventoryClickEvent(InventoryClickEvent e) { if (!permission.isSuffix()) continue; if (sk == id) { if (Main.plugin.getConfig().getBoolean("UseLuckPerms5.Enabled")) { + Map.Entry suffix = permission.getSuffix(); if (permission.isTemporary()) - Tools.sendCommand(p, "lp group " + g.getName() + " meta unsettemp " + '"' + permission.getPermission() + '"' + " " + Tools.contextConverter(permission.getFullContexts())); + Tools.sendCommand(p, "lp group " + g.getName() + " meta removetempsuffix " + suffix.getKey() + " " + '"' + suffix.getValue() + '"' + " " + Tools.contextConverter(permission.getFullContexts())); else - Tools.sendCommand(p, "lp group " + g.getName() + " meta unset " + '"' + permission.getPermission() + '"' + " " + Tools.contextConverter(permission.getFullContexts())); + Tools.sendCommand(p, "lp group " + g.getName() + " meta removesuffix " + suffix.getKey() + " " + '"' + suffix.getValue() + '"' + " " + Tools.contextConverter(permission.getFullContexts())); break; } else { if (permission.isTemporary()) diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/users/Prefix.java b/src/main/java/me/AsVaidas/LuckPemsGUI/users/Prefix.java index 0342efb..5fd9389 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/users/Prefix.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/users/Prefix.java @@ -156,11 +156,20 @@ public void onInventoryClickEvent(InventoryClickEvent e) { for (Node permission : g.getPermissions()) { if (!permission.isPrefix()) continue; if (sk == id) { - if (permission.isTemporary()) - Tools.sendCommand(p, "lp user "+g.getName()+" unsettemp "+'"'+permission.getPermission()+'"'+" "+Tools.contextConverter(permission.getFullContexts())); - else - Tools.sendCommand(p, "lp user "+g.getName()+" unset "+'"'+permission.getPermission()+'"'+" "+Tools.contextConverter(permission.getFullContexts())); - break; + if (Main.plugin.getConfig().getBoolean("UseLuckPerms5.Enabled")) { + Map.Entry prefix = permission.getPrefix(); + if (permission.isTemporary()) + Tools.sendCommand(p, "lp user " + g.getName() + " meta removetempprefix " + prefix.getKey() + " " + '"' + prefix.getValue() + '"' + " " + Tools.contextConverter(permission.getFullContexts())); + else + Tools.sendCommand(p, "lp user " + g.getName() + " meta removeprefix " + prefix.getKey() + " " + '"' + prefix.getValue() + '"' + " " + Tools.contextConverter(permission.getFullContexts())); + break; + } else { + if (permission.isTemporary()) + Tools.sendCommand(p, "lp user " + g.getName() + " unsettemp " + '"' + permission.getPermission() + '"' + " " + Tools.contextConverter(permission.getFullContexts())); + else + Tools.sendCommand(p, "lp user " + g.getName() + " unset " + '"' + permission.getPermission() + '"' + " " + Tools.contextConverter(permission.getFullContexts())); + break; + } } sk++; } diff --git a/src/main/java/me/AsVaidas/LuckPemsGUI/users/Suffix.java b/src/main/java/me/AsVaidas/LuckPemsGUI/users/Suffix.java index c0d5555..0333d7e 100644 --- a/src/main/java/me/AsVaidas/LuckPemsGUI/users/Suffix.java +++ b/src/main/java/me/AsVaidas/LuckPemsGUI/users/Suffix.java @@ -156,11 +156,20 @@ public void onInventoryClickEvent(InventoryClickEvent e) { for (Node permission : g.getPermissions()) { if (!permission.isSuffix()) continue; if (sk == id) { - if (permission.isTemporary()) - Tools.sendCommand(p, "lp user "+g.getName()+" unsettemp "+'"'+permission.getPermission()+'"'+" "+Tools.contextConverter(permission.getFullContexts())); - else - Tools.sendCommand(p, "lp user "+g.getName()+" unset "+'"'+permission.getPermission()+'"'+" "+Tools.contextConverter(permission.getFullContexts())); - break; + if (Main.plugin.getConfig().getBoolean("UseLuckPerms5.Enabled")) { + Map.Entry suffix = permission.getSuffix(); + if (permission.isTemporary()) + Tools.sendCommand(p, "lp user " + g.getName() + " meta removetempsuffix " + suffix.getKey() + " " + '"' + suffix.getValue() + '"' + " " + Tools.contextConverter(permission.getFullContexts())); + else + Tools.sendCommand(p, "lp user " + g.getName() + " meta removesuffix " + suffix.getKey() + " " + '"' + suffix.getValue() + '"' + " " + Tools.contextConverter(permission.getFullContexts())); + break; + } else { + if (permission.isTemporary()) + Tools.sendCommand(p, "lp user " + g.getName() + " unsettemp " + '"' + permission.getPermission() + '"' + " " + Tools.contextConverter(permission.getFullContexts())); + else + Tools.sendCommand(p, "lp user " + g.getName() + " unset " + '"' + permission.getPermission() + '"' + " " + Tools.contextConverter(permission.getFullContexts())); + break; + } } sk++; }