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

Call superclass constructor for GroupManager, fixes #48

Browse source
This commit is contained in:
vemacs 2015-06-02 17:09:03 -06:00
parent 5375ff3790
commit ce5ffb9bd7
3 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -11,6 +11,7 @@ public class GroupManagerHandler extends AbstractVaultHandler {
private final transient GroupManager groupManager; private final transient GroupManager groupManager;
public GroupManagerHandler(final Plugin permissionsPlugin) { public GroupManagerHandler(final Plugin permissionsPlugin) {
super();
groupManager = ((GroupManager) permissionsPlugin); groupManager = ((GroupManager) permissionsPlugin);
} }

9
Essentials/src/com/earth2me/essentials/perm/PermissionsExHandler.java
View file

@ -1,20 +1,13 @@
package com.earth2me.essentials.perm; package com.earth2me.essentials.perm;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import ru.tehkode.permissions.PermissionManager;
import ru.tehkode.permissions.PermissionUser; import ru.tehkode.permissions.PermissionUser;
import ru.tehkode.permissions.bukkit.PermissionsEx; import ru.tehkode.permissions.bukkit.PermissionsEx;
public class PermissionsExHandler extends AbstractVaultHandler { public class PermissionsExHandler extends AbstractVaultHandler {
private final transient PermissionManager manager;
public PermissionsExHandler() {
manager = PermissionsEx.getPermissionManager();
}
@Override @Override
public boolean canBuild(final Player base, final String group) { public boolean canBuild(final Player base, final String group) {
final PermissionUser user = manager.getUser(base.getUniqueId()); final PermissionUser user = PermissionsEx.getPermissionManager().getUser(base.getUniqueId());
return user != null && user.getOptionBoolean("build", base.getWorld().getName(), false); return user != null && user.getOptionBoolean("build", base.getWorld().getName(), false);
} }
} }

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

@ -8,7 +8,6 @@ import org.bukkit.plugin.PluginManager;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger;
public class PermissionsHandler implements IPermissionsHandler { public class PermissionsHandler implements IPermissionsHandler {
@ -147,10 +146,10 @@ public class PermissionsHandler implements IPermissionsHandler {
if (vault.setupProviders()) { if (vault.setupProviders()) {
ess.getLogger().info("Using generic Vault based permissions."); ess.getLogger().info("Using generic Vault based permissions.");
handler = vault; handler = vault;
}
}
return; return;
} }
}
}
if (useSuperperms) { if (useSuperperms) {
if (!(handler instanceof SuperpermsHandler)) { if (!(handler instanceof SuperpermsHandler)) {