From f1a50f433f60ce47dfb358ab978acb1dacd8a1e4 Mon Sep 17 00:00:00 2001
From: Luck <git@lucko.me>
Date: Tue, 7 Nov 2017 15:22:31 +0000
Subject: [PATCH] Throw exception earlier if an invalid permission is
 added/removed via Vault (#526)

---
 .../bukkit/vault/VaultPermissionHook.java     | 27 +++++++------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/VaultPermissionHook.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/VaultPermissionHook.java
index 4da9d836..353ae648 100644
--- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/VaultPermissionHook.java
+++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/VaultPermissionHook.java
@@ -28,8 +28,9 @@ package me.lucko.luckperms.bukkit.vault;
 import lombok.Getter;
 import lombok.NonNull;
 
+import com.google.common.base.Preconditions;
+
 import me.lucko.luckperms.api.Contexts;
-import me.lucko.luckperms.api.DataMutateResult;
 import me.lucko.luckperms.api.Node;
 import me.lucko.luckperms.api.context.ImmutableContextSet;
 import me.lucko.luckperms.api.context.MutableContextSet;
@@ -419,36 +420,26 @@ public class VaultPermissionHook extends Permission {
     // utility methods for modifying the state of PermissionHolders
 
     private void holderAddPermission(PermissionHolder holder, String permission, String world) {
+        Preconditions.checkNotNull(permission, "permission is null");
+        Preconditions.checkArgument(!permission.isEmpty(), "permission is an empty string");
         executor.execute(() -> {
-            DataMutateResult result;
-            if (world != null && !world.equals("") && !world.equalsIgnoreCase("global")) {
-                result = holder.setPermission(NodeFactory.make(permission, true, getServer(), world));
-            } else {
-                result = holder.setPermission(NodeFactory.make(permission, true, getServer()));
-            }
-
-            if (result.asBoolean()) {
+            if (holder.setPermission(NodeFactory.make(permission, true, getServer(), world)).asBoolean()) {
                 holderSave(holder);
             }
         });
     }
 
     private void holderRemovePermission(PermissionHolder holder, String permission, String world) {
+        Preconditions.checkNotNull(permission, "permission is null");
+        Preconditions.checkArgument(!permission.isEmpty(), "permission is an empty string");
         executor.execute(() -> {
-            DataMutateResult result;
-            if (world != null && !world.equals("") && !world.equalsIgnoreCase("global")) {
-                result = holder.unsetPermission(NodeFactory.make(permission, getServer(), world));
-            } else {
-                result = holder.unsetPermission(NodeFactory.make(permission, getServer()));
-            }
-
-            if (result.asBoolean()) {
+            if (holder.unsetPermission(NodeFactory.make(permission, getServer(), world)).asBoolean()) {
                 holderSave(holder);
             }
         });
     }
 
-    public void holderSave(PermissionHolder holder) {
+    void holderSave(PermissionHolder holder) {
         if (holder instanceof User) {
             User u = (User) holder;
             plugin.getStorage().saveUser(u).thenRunAsync(() -> u.getRefreshBuffer().request(), plugin.getScheduler().async());