diff --git a/lib/Permissions.jar b/lib/Permissions.jar deleted file mode 100644 index 31c3e5d9..00000000 Binary files a/lib/Permissions.jar and /dev/null differ diff --git a/lib/PermissionsEx.jar b/lib/PermissionsEx.jar deleted file mode 100644 index 37121e65..00000000 Binary files a/lib/PermissionsEx.jar and /dev/null differ diff --git a/src/com/massivecraft/factions/P.java b/src/com/massivecraft/factions/P.java index b0d89cb8..8dfc6046 100644 --- a/src/com/massivecraft/factions/P.java +++ b/src/com/massivecraft/factions/P.java @@ -36,7 +36,6 @@ import com.massivecraft.factions.struct.Rel; import com.massivecraft.factions.zcore.MPlugin; import com.griefcraft.lwc.LWCPlugin; -import com.nijiko.permissions.PermissionHandler; import com.earth2me.essentials.chat.EssentialsChat; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; @@ -75,8 +74,7 @@ public class P extends MPlugin } - - public static PermissionHandler Permissions; + private static EssentialsChat essChat; diff --git a/src/com/massivecraft/factions/zcore/util/PermUtil.java b/src/com/massivecraft/factions/zcore/util/PermUtil.java index 72e05d46..f68d19a9 100644 --- a/src/com/massivecraft/factions/zcore/util/PermUtil.java +++ b/src/com/massivecraft/factions/zcore/util/PermUtil.java @@ -3,25 +3,16 @@ package com.massivecraft.factions.zcore.util; import java.util.*; import java.util.Map.Entry; -import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.permissions.Permission; -import org.bukkit.plugin.Plugin; - -import ru.tehkode.permissions.PermissionManager; -import ru.tehkode.permissions.bukkit.PermissionsEx; import com.massivecraft.factions.zcore.Lang; import com.massivecraft.factions.zcore.MPlugin; -import com.nijiko.permissions.PermissionHandler; -import com.nijikokun.bukkit.Permissions.Permissions; public class PermUtil { - - public PermissionManager pex = null; - public PermissionHandler perm2or3 = null; + public Map permissionDescriptions = new HashMap(); protected MPlugin p; @@ -40,30 +31,13 @@ public class PermUtil { /** * This method hooks into all permission plugins we are supporting */ - public void setup() + public final void setup() { for(Permission permission : p.getDescription().getPermissions()) { //p.log("\""+permission.getName()+"\" = \""+permission.getDescription()+"\""); this.permissionDescriptions.put(permission.getName(), permission.getDescription()); } - - if ( Bukkit.getServer().getPluginManager().isPluginEnabled("PermissionsEx")) - { - pex = PermissionsEx.getPermissionManager(); - p.log("Will use this plugin for permissions: " + Bukkit.getServer().getPluginManager().getPlugin("PermissionsEx").getDescription().getFullName()); - return; - } - - if ( Bukkit.getServer().getPluginManager().isPluginEnabled("Permissions")) - { - Plugin permissionsPlugin = Bukkit.getServer().getPluginManager().getPlugin("Permissions"); - perm2or3 = ((Permissions) permissionsPlugin).getHandler(); - p.log("Will use this plugin for permissions: " + permissionsPlugin.getDescription().getFullName()); - return; - } - - p.log("No permission plugin detected. Defaulting to native bukkit permissions."); } public String getPermissionDescription (String perm) @@ -88,19 +62,7 @@ public class PermUtil { { return me.hasPermission(perm); } - - if (pex != null) - { - //return pex.has((Player)me, perm); - // Since pex supports superperms we should use those instead. - return ((Player)me).hasPermission(perm); - } - - if (perm2or3 != null) - { - return perm2or3.has((Player)me, perm); - } - + return me.hasPermission(perm); }