diff options
| author | KHobbits <rob@khobbits.co.uk> | 2013-01-14 07:37:11 +0000 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2013-01-14 07:37:11 +0000 |
| commit | 115c4fa1d098ba31c2d5408d2563a0c90c56f105 (patch) | |
| tree | 2e7b50b5b55d25172e2c142d9b646cf10fed1f67 /EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java | |
| parent | 0c19b2feed9f44e08086a573fc2dc232d8d1d729 (diff) | |
| parent | 675c4b7897d906f1d8ca0ef0176b88dc09049419 (diff) | |
| download | Essentials-115c4fa1d098ba31c2d5408d2563a0c90c56f105.tar Essentials-115c4fa1d098ba31c2d5408d2563a0c90c56f105.tar.gz Essentials-115c4fa1d098ba31c2d5408d2563a0c90c56f105.tar.lz Essentials-115c4fa1d098ba31c2d5408d2563a0c90c56f105.tar.xz Essentials-115c4fa1d098ba31c2d5408d2563a0c90c56f105.zip | |
Merge remote-tracking branch 'remotes/origin/groupmanager' into 2.9
Diffstat (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java')
| -rw-r--r-- | EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java index e954a88fd..59efb33dc 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java @@ -16,6 +16,7 @@ import org.anjocaido.groupmanager.data.Group; import org.anjocaido.groupmanager.dataholder.WorldDataHolder; import org.anjocaido.groupmanager.data.User; import org.anjocaido.groupmanager.utils.PermissionCheckResult; +import org.bukkit.Bukkit; import org.bukkit.entity.Player; /** @@ -784,6 +785,15 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface { if (user == null || targetPermission == null || targetPermission.isEmpty()) { return result; } + + /* + * Do not push any perms to bukkit if... + * We are in offline mode + * and the player has the 'groupmanager.noofflineperms' permission. + */ + if (!Bukkit.getServer().getOnlineMode() + && (checkFullGMPermission(user, "groupmanager.noofflineperms", true).resultType == PermissionCheckResult.Type.FOUND)) + return result; if (checkBukkit) { // Check Bukkit perms to support plugins which add perms via code |