A few small optimizations

bukkit/src/main/java/me/lucko/luckperms/bukkit/WorldCalculator.java

@@ -71,11 +71,11 @@ public class WorldCalculator extends ContextCalculator<Player> implements Listen
 
     private String getWorld(Player player) {
         UUID internal = plugin.getUuidCache().getUUID(player.getUniqueId());
-        if (!worldCache.containsKey(internal)) {
+        String world = worldCache.get(internal);
+        if (world == null) {
             return null;
         }
 
-        String world = worldCache.get(internal);
         return plugin.getConfiguration().getWorldRewrites().getOrDefault(world, world);
     }
 

common/src/main/java/me/lucko/luckperms/common/calculators/RegexProcessor.java

@@ -39,15 +39,17 @@ public class RegexProcessor implements PermissionProcessor {
     @Override
     public Tristate hasPermission(String permission) {
         for (Map.Entry<String, Boolean> e : map.entrySet()) {
-            if (e.getKey().toLowerCase().startsWith("r=")) {
+            if (!e.getKey().startsWith("r=") && !e.getKey().startsWith("R=")) {
-                Pattern p = Patterns.compile(e.getKey().substring(2));
+                continue;
-                if (p == null) {
+            }
-                    continue;
-                }
 
-                if (p.matcher(permission).matches()) {
+            Pattern p = Patterns.compile(e.getKey().substring(2));
-                    return Tristate.fromBoolean(e.getValue());
+            if (p == null) {
-                }
+                continue;
+            }
+
+            if (p.matcher(permission).matches()) {
+                return Tristate.fromBoolean(e.getValue());
             }
         }
 

common/src/main/java/me/lucko/luckperms/common/constants/Patterns.java

@@ -22,16 +22,30 @@
 
 package me.lucko.luckperms.common.constants;
 
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
 import lombok.experimental.UtilityClass;
 
-import java.util.Map;
+import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Pattern;
-import java.util.regex.PatternSyntaxException;
 
 @UtilityClass
 public class Patterns {
-    private static final Map<String, Pattern> CACHE = new ConcurrentHashMap<>();
+    private static final LoadingCache<String, Pattern> CACHE = CacheBuilder.newBuilder()
+            .build(new CacheLoader<String, Pattern>() {
+                @Override
+                public Pattern load(String s) throws Exception {
+                    return Pattern.compile(s);
+                }
+
+                @Override
+                public ListenableFuture<Pattern> reload(String s, Pattern pattern) {
+                    return Futures.immediateFuture(pattern);
+                }
+            });
 
     public static final Pattern COMMAND_SEPARATOR = Pattern.compile(" (?=([^\\\"]*\\\"[^\\\"]*\\\")*[^\\\"]*$)");
     public static final Pattern NON_ALPHA_NUMERIC = Pattern.compile("[\\/\\$\\.\\- ]");
@@ -42,14 +56,8 @@ public class Patterns {
 
     public static Pattern compile(String regex) {
         try {
-            return CACHE.computeIfAbsent(regex, s -> {
+            return CACHE.get(regex);
-                try {
+        } catch (ExecutionException e) {
-                    return Pattern.compile(regex);
-                } catch (PatternSyntaxException e) {
-                    return null;
-                }
-            });
-        } catch (NullPointerException e) {
             return null;
         }
     }

common/src/main/java/me/lucko/luckperms/common/users/User.java

@@ -112,10 +112,7 @@ public class User extends PermissionHolder implements Identifiable<UserIdentifie
      * Removes the UserData cache from this user
      */
     public void unregisterData() {
-        if (userData != null) {
+        userData = null;
-            userData.invalidateCache();
-            userData = null;
-        }
     }
 
     /**

common/src/main/java/me/lucko/luckperms/common/utils/AbstractManager.java

@@ -22,9 +22,14 @@
 
 package me.lucko.luckperms.common.utils;
 
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+import com.google.common.cache.RemovalListener;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
 
-import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Function;
 
@@ -34,14 +39,23 @@ import java.util.function.Function;
  * @param <T> the class this manager is "managing"
  */
 public abstract class AbstractManager<I, T extends Identifiable<I>> implements Function<I, T> {
-    private final Map<I, T> objects = new HashMap<>();
+
+    private final LoadingCache<I, T> objects = CacheBuilder.newBuilder()
+            .removalListener((RemovalListener<I, T>) removal -> preUnload(removal.getValue()))
+            .build(new CacheLoader<I, T>() {
+                @Override
+                public T load(I i) {
+                    return apply(i);
+                }
+
+                @Override
+                public ListenableFuture<T> reload(I i, T t) {
+                    return Futures.immediateFuture(t); // Never needs to be refreshed.
+                }
+            });
 
     public final Map<I, T> getAll() {
-        Map<I, T> map;
+        return ImmutableMap.copyOf(objects.asMap());
-        synchronized (objects) {
-            map = ImmutableMap.copyOf(objects);
-        }
-        return map;
     }
 
     /**
@@ -50,9 +64,7 @@ public abstract class AbstractManager<I, T extends Identifiable<I>> implements F
      * @return a {@link T} object if the object is loaded or makes and returns a new object
      */
     public final T getOrMake(I id) {
-        synchronized (objects) {
+        return objects.getUnchecked(id);
-            return objects.computeIfAbsent(id, this);
-        }
     }
 
     /**
@@ -61,9 +73,7 @@ public abstract class AbstractManager<I, T extends Identifiable<I>> implements F
      * @return a {@link T} object if the object is loaded, returns null if the object is not loaded
      */
     public final T get(I id) {
-        synchronized (objects) {
+        return objects.asMap().get(id);
-            return objects.get(id);
-        }
     }
 
     /**
@@ -72,9 +82,7 @@ public abstract class AbstractManager<I, T extends Identifiable<I>> implements F
      * @return true if the object is loaded
      */
     public final boolean isLoaded(I id) {
-        synchronized (objects) {
+        return objects.asMap().containsKey(id);
-            return objects.containsKey(id);
-        }
     }
 
     /**
@@ -83,12 +91,7 @@ public abstract class AbstractManager<I, T extends Identifiable<I>> implements F
      */
     public final void unload(T t) {
         if (t != null) {
-            synchronized (objects) {
+            objects.invalidate(t);
-                objects.computeIfPresent(t.getId(), (i, t1) -> {
-                    preUnload(t1);
-                    return null;
-                });
-            }
         }
     }
 
@@ -100,10 +103,7 @@ public abstract class AbstractManager<I, T extends Identifiable<I>> implements F
      * Unloads all objects from the manager
      */
     public final void unloadAll() {
-        synchronized (objects) {
+        objects.invalidateAll();
-            objects.values().forEach(this::preUnload);
-            objects.clear();
-        }
     }
 
 }