Upstream/Multiverse-Core
1
0
Fork 0
mirror of https://github.com/Multiverse/Multiverse-Core.git synced 2024-10-03 01:57:30 +02:00
Code Issues Projects Releases Wiki Activity

Revert "Permissions is Silly"

Browse Source 
This reverts commit d9cca0f822.
This commit is contained in:
Eric Stokes 2011-07-10 14:02:39 -06:00
parent d9cca0f822
commit 8e92496fb9
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/onarandombox/MultiverseCore/MVPermissions.java
View File

@ -129,19 +129,10 @@ public class MVPermissions implements PermissionsInterface {
if (player.isOp() && opFallback) {
// If Player is Op we always let them use it if they have the fallback enabled!
return true;
//} else if (this.permissions != null && this.permissions.has(player, node)) {
} else
try {
if (this.permissions != null && this.permissions.safeGetUser(player.getWorld().getName(), player.getName()).hasPermission(node)) {
// If Permissions 3 is enabled we check against them.
return true;
}
} catch (Exception e) {
if (this.permissions != null && this.permissions.has(player, node)) {
// If Permissions 2 is enabled we check against them.
return true;
}
}
} else if (this.permissions != null && this.permissions.has(player, node)) {
// If Permissions is enabled we check against them.
return true;
}
// If the Player doesn't have Permissions and isn't an Op then
// we return true if OP is not required, otherwise we return false
// This allows us to act as a default permission guidance