From cf82a3a6120894dfcf2dc8fd5dd24a0c0ebee318 Mon Sep 17 00:00:00 2001 From: Andreas Troelsen Date: Tue, 3 Jul 2018 01:02:40 +0200 Subject: [PATCH] Remove obsolete class permission methods in ArenaMaster. Following the removal of class permission commands in a88556771f0d64955656c770c783f884277e485b, these methods are now obsolete. --- .../garbagemule/MobArena/ArenaMasterImpl.java | 59 ------------------- .../MobArena/framework/ArenaMaster.java | 4 -- 2 files changed, 63 deletions(-) diff --git a/src/main/java/com/garbagemule/MobArena/ArenaMasterImpl.java b/src/main/java/com/garbagemule/MobArena/ArenaMasterImpl.java index dee2dc4..58db32d 100644 --- a/src/main/java/com/garbagemule/MobArena/ArenaMasterImpl.java +++ b/src/main/java/com/garbagemule/MobArena/ArenaMasterImpl.java @@ -8,7 +8,6 @@ import com.garbagemule.MobArena.framework.Arena; import com.garbagemule.MobArena.framework.ArenaMaster; import com.garbagemule.MobArena.things.Thing; import com.garbagemule.MobArena.util.ItemParser; -import com.garbagemule.MobArena.util.TextUtils; import com.garbagemule.MobArena.util.config.ConfigUtils; import org.bukkit.Bukkit; import org.bukkit.Location; @@ -489,64 +488,6 @@ public class ArenaMasterImpl implements ArenaMaster classes.remove(lowercase); } - public boolean addClassPermission(String classname, String perm) { - return addRemoveClassPermission(classname, perm, true); - } - - public boolean removeClassPermission(String classname, String perm) { - return addRemoveClassPermission(classname, perm, false); - } - - private boolean addRemoveClassPermission(String classname, String perm, boolean add) { - classname = TextUtils.camelCase(classname); - String path = "classes." + classname; - if (config.getConfigurationSection(path) == null) - return false; - - // Grab the class section - ConfigurationSection section = config.getConfigurationSection(path); - - // Get any previous nodes - List nodes = section.getStringList("permissions"); - if (nodes.contains(perm) && add) { - return false; - } - else if (nodes.contains(perm) && !add) { - nodes.remove(perm); - } - else if (!nodes.contains(perm) && add) { - removeContradictions(nodes, perm); - nodes.add(perm); - } - else if (!nodes.contains(perm) && !add) { - return false; - } - - // Replace the set. - section.set("permissions", nodes); - plugin.saveConfig(); - - // Reload the class. - loadClass(classname); - return true; - } - - /** - * Removes any nodes that would contradict the permission, e.g. if the node - * 'mobarena.use' is in the set, and the perm node is '-mobarena.use', the - * '-mobarena.use' node is removed as to not contradict the new - * 'mobarena.use' node. - */ - private void removeContradictions(List nodes, String perm) { - if (perm.startsWith("^") || perm.startsWith("-")) { - nodes.remove(perm.substring(1).trim()); - } - else { - nodes.remove("^" + perm); - nodes.remove("-" + perm); - } - } - /** * Load all arena-related stuff. */ diff --git a/src/main/java/com/garbagemule/MobArena/framework/ArenaMaster.java b/src/main/java/com/garbagemule/MobArena/framework/ArenaMaster.java index d7aedb8..890408d 100644 --- a/src/main/java/com/garbagemule/MobArena/framework/ArenaMaster.java +++ b/src/main/java/com/garbagemule/MobArena/framework/ArenaMaster.java @@ -111,10 +111,6 @@ public interface ArenaMaster void removeClassNode(String className); - boolean addClassPermission(String className, String perm); - - boolean removeClassPermission(String className, String perm); - /** * Load all arena-related stuff. */