Code improvements

Author: bengibbs-afero

src/main/java/world/bentobox/bentobox/api/addons/AddonClassLoader.java

@@ -218,31 +218,19 @@ public Class<?> findClass(String name, boolean checkGlobal) {
         if (name.startsWith("world.bentobox.bentobox")) {
             return null;
         }
-        // Check local cache first.
-        Class<?> result = classes.get(name);
-        if (result == null) {
-            // Check global cache for classes from other addons.
-            if (checkGlobal) {
-                result = loader.getClassByName(name);
+        return classes.computeIfAbsent(name, key -> {
+            Class<?> resolved = checkGlobal ? loader.getClassByName(key) : null;
+            if (resolved != null) {
+                return resolved;
             }
-
-            if (result == null) {
-                // Try to find the class in this addon's jar.
-                try {
-                    result = super.findClass(name);
-                } catch (ClassNotFoundException | NoClassDefFoundError e) {
-                    // Do nothing. The class is not in this jar.
-                }
-                if (result != null) {
-                    // Class found in this addon's jar, so add it to the global cache.
-                    loader.setClass(name, result);
-
-                }
+            try {
+                resolved = AddonClassLoader.super.findClass(key);
+                loader.setClass(key, resolved);
+                return resolved;
+            } catch (ClassNotFoundException | NoClassDefFoundError e) {
+                return null; // Not found locally.
             }
-            // Add the class to the local cache.
-            classes.put(name, result);
-        }
-        return result;
+        });
     }
 
     /**

src/main/java/world/bentobox/bentobox/api/user/User.java

@@ -439,8 +439,7 @@ private int iteratePerms(List<String> permissions, String permPrefix, int defaul
                 String[] spl = permission.split(permPrefix);
                 if (spl.length > 1) {
                     if (!NumberUtils.isCreatable(spl[1])) {
-                        plugin.logError("Player " + player.getName() + " has permission: '" + permission
-                                + "' <-- the last part MUST be a number! Ignoring...");
+                        plugin.logError("Player " + player.getName() + " has permission: '" + permission);
                     } else {
                         int v = Integer.parseInt(spl[1]);
                         if (v < 0) {
@@ -979,7 +978,7 @@ public String toString() {
                 + (offlinePlayer != null ? "offlinePlayer=" + offlinePlayer + ", " : "")
                 + (playerUUID != null ? "playerUUID=" + playerUUID + ", " : "")
                 + (sender != null ? "sender=" + sender + ", " : "") + (addon != null ? "addon=" + addon + ", " : "")
-                + (getLocation() != null ? "getLocation()=" + getLocation() + ", " : "") + "isPlayer()=" + isPlayer()
+                + "getLocation()=" + getLocation() + "isPlayer()=" + isPlayer()
                 + "]";
     }