TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-08-05 12:02:53 +00:00
Code Issues Projects Releases Wiki Activity

[Untested] [Experimental] PermissionsHandler cleanup, add specific logging to detect Vault with no perms plugin

Browse source
This commit is contained in:
vemacs 2015-06-19 15:47:58 -04:00
parent 6ca3712b79
commit a6232b6bb6
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Essentials/src/com/earth2me/essentials/perm/PermissionsHandler.java
View file

@ -2,6 +2,7 @@ package com.earth2me.essentials.perm;
import com.earth2me.essentials.Essentials; import com.earth2me.essentials.Essentials;
import com.earth2me.essentials.perm.impl.*; import com.earth2me.essentials.perm.impl.*;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import java.util.Arrays; import java.util.Arrays;
@ -125,7 +126,10 @@ public class PermissionsHandler implements IPermissionsHandler {
((SuperpermsHandler) handler).getEnabledPermsPlugin() + " without Vault installed."); ((SuperpermsHandler) handler).getEnabledPermsPlugin() + " without Vault installed.");
ess.getLogger().warning("Features such as chat prefixes/suffixes and group-related functionality will not " + ess.getLogger().warning("Features such as chat prefixes/suffixes and group-related functionality will not " +
"work until you install Vault."); "work until you install Vault.");
} else { } else if (Bukkit.getPluginManager().getPlugin("Vault") != null) {
ess.getLogger().info("Detected Vault but no supported permissions plugin. Using superperms based permissions.");
}
{
ess.getLogger().info("Using superperms-based permissions."); ess.getLogger().info("Using superperms-based permissions.");
} }
} else if (handler instanceof ConfigPermissionsHandler) { } else if (handler instanceof ConfigPermissionsHandler) {

1
Essentials/src/com/earth2me/essentials/perm/impl/AbstractVaultHandler.java
View file

@ -66,6 +66,7 @@ public abstract class AbstractVaultHandler extends SuperpermsHandler {
} }
public boolean canLoad() { public boolean canLoad() {
if (Bukkit.getPluginManager().getPlugin("Vault") == null) return false;
try { try {
return setupProviders(); return setupProviders();
} catch (Throwable t) { } catch (Throwable t) {