fix npe while loading users with useuuids disabled

weaondara · Nov 3, 2019 · be81ebe · be81ebe
1 parent f603b75
commit be81ebe
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/main/java/net/alpenblock/bungeeperms/io/MySQLBackEnd.java b/src/main/java/net/alpenblock/bungeeperms/io/MySQLBackEnd.java
@@ -164,7 +164,7 @@ public User loadUser(String user)
         List<String> groups = getValues(mpe.getData("groups"));
         List<TimedValue<String>> timedgroups = getValuesTimed(mpe.getData("timedgroups"));
 
-        UUID uuid = BungeePerms.getInstance().getPermissionsManager().getUUIDPlayerDB().getUUID(mpe.getName());
+        UUID uuid = BungeePerms.getInstance().getConfig().isUseUUIDs() ? BungeePerms.getInstance().getPermissionsManager().getUUIDPlayerDB().getUUID(mpe.getName()) : null;
         User u = new User(mpe.getName(), uuid, groups, timedgroups, new ArrayList(), new ArrayList(), new HashMap(), null, null, null);
         loadServerWorlds(mpe, u);
         u.invalidateCache();

diff --git a/src/main/java/net/alpenblock/bungeeperms/io/YAMLBackEnd.java b/src/main/java/net/alpenblock/bungeeperms/io/YAMLBackEnd.java
@@ -167,9 +167,12 @@ public User loadUser(String user)
         User u = loadUser0(user);
         if (u == null)
             return null;
-        UUID uuid = BungeePerms.getInstance().getPermissionsManager().getUUIDPlayerDB().getUUID(user);
+        if (BungeePerms.getInstance().getConfig().isUseUUIDs())
+        {
+            UUID uuid = BungeePerms.getInstance().getPermissionsManager().getUUIDPlayerDB().getUUID(user);
+            u.setUUID(uuid);
+        }
         u.setName(user);
-        u.setUUID(uuid);
         u.invalidateCache();
         return u;
     }