From fb0e6941559c2ca67680a2fa5071cd34fde3f4cd Mon Sep 17 00:00:00 2001
From: Luck <git@lucko.me>
Date: Wed, 7 Sep 2016 23:21:24 +0100
Subject: [PATCH] Add auto-op. Closes #8

---
 .../java/me/lucko/luckperms/users/BukkitUser.java | 15 +++++++++++++++
 .../lucko/luckperms/users/BukkitUserManager.java  | 14 ++++++++------
 bukkit/src/main/resources/config.yml              |  8 ++++++++
 .../me/lucko/luckperms/core/LPConfiguration.java  |  6 +++++-
 4 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/bukkit/src/main/java/me/lucko/luckperms/users/BukkitUser.java b/bukkit/src/main/java/me/lucko/luckperms/users/BukkitUser.java
index 0eb6e8260..ea4e74ee5 100644
--- a/bukkit/src/main/java/me/lucko/luckperms/users/BukkitUser.java
+++ b/bukkit/src/main/java/me/lucko/luckperms/users/BukkitUser.java
@@ -105,11 +105,26 @@ public class BukkitUser extends User {
             existing.clear();
             existing.putAll(toApply);
 
+            boolean op = false;
+            if (plugin.getConfiguration().getAutoOp()) {
+                for (Map.Entry<String, Boolean> e : toApply.entrySet()) {
+                    if (e.getKey().equalsIgnoreCase("luckperms.autoop") && e.getValue()) {
+                        op = true;
+                        break;
+                    }
+                }
+            }
+            boolean finalOp = op;
+
             /* Must be called sync, as #recalculatePermissions is an unmodified Bukkit API call that is absolutely not thread safe.
                Shouldn't be too taxing on the server. This only gets called when permissions have actually changed,
                which is like once per user per login, assuming their permissions don't get modified. */
             plugin.doSync(() -> {
                 attachment.getAttachment().getPermissible().recalculatePermissions();
+                if (plugin.getConfiguration().getAutoOp()) {
+                    attachment.getAttachment().getPermissible().setOp(finalOp);
+                }
+
                 plugin.getApiProvider().fireEventAsync(new UserPermissionRefreshEvent(new UserLink(this)));
             });
 
diff --git a/bukkit/src/main/java/me/lucko/luckperms/users/BukkitUserManager.java b/bukkit/src/main/java/me/lucko/luckperms/users/BukkitUserManager.java
index f29bd45b1..e7d9f19f3 100644
--- a/bukkit/src/main/java/me/lucko/luckperms/users/BukkitUserManager.java
+++ b/bukkit/src/main/java/me/lucko/luckperms/users/BukkitUserManager.java
@@ -47,14 +47,16 @@ public class BukkitUserManager extends UserManager {
     public void preUnload(User user) {
         if (user instanceof BukkitUser) {
             BukkitUser u = (BukkitUser) user;
-
-            if (u.getAttachment() != null) {
-                Player player = plugin.getServer().getPlayer(plugin.getUuidCache().getExternalUUID(u.getUuid()));
-
-                if (player != null) {
+            Player player = plugin.getServer().getPlayer(plugin.getUuidCache().getExternalUUID(u.getUuid()));
+            if (player != null) {
+                if (u.getAttachment() != null) {
                     player.removeAttachment(u.getAttachment().getAttachment());
+                    u.setAttachment(null);
+                }
+
+                if (plugin.getConfiguration().getAutoOp()) {
+                    player.setOp(false);
                 }
-                u.setAttachment(null);
             }
         }
     }
diff --git a/bukkit/src/main/resources/config.yml b/bukkit/src/main/resources/config.yml
index 673721a5f..d4300d402 100644
--- a/bukkit/src/main/resources/config.yml
+++ b/bukkit/src/main/resources/config.yml
@@ -49,6 +49,14 @@ log-notify: true
 # If the vanilla OP system is enabled. If set to false, all users will be de-opped, and the op/deop commands will be disabled.
 enable-ops: true
 
+# If set to true, any user with the permission "luckperms.autoop" will automatically be granted server operator status.
+# This permission can be inherited, or set on specific servers/worlds, temporarily, etc.
+# Additionally, setting this to true will force the "enable-ops" option above to false. All users will be de-opped unless
+# they have the permission node, and the op/deop commands will be disabled.
+#
+# It is recommended that you use this option instead of assigning a single '*' permission.
+auto-op: false
+
 # If opped players should be allowed to use LuckPerms commands. Set to false to only allow users who have the permissions access to the commands
 commands-allow-op: true
 
diff --git a/common/src/main/java/me/lucko/luckperms/core/LPConfiguration.java b/common/src/main/java/me/lucko/luckperms/core/LPConfiguration.java
index 4d36c267b..404f6ccec 100644
--- a/common/src/main/java/me/lucko/luckperms/core/LPConfiguration.java
+++ b/common/src/main/java/me/lucko/luckperms/core/LPConfiguration.java
@@ -112,13 +112,17 @@ public abstract class LPConfiguration<T extends LuckPermsPlugin> {
     }
 
     public boolean getEnableOps() {
-        return getBoolean("enable-ops", true);
+        return !getAutoOp() && getBoolean("enable-ops", true);
     }
 
     public boolean getCommandsAllowOp() {
         return getBoolean("commands-allow-op", true);
     }
 
+    public boolean getAutoOp() {
+        return getBoolean("auto-op", false);
+    }
+
     public String getVaultServer() {
         return getString("vault-server", "global");
     }