From 9204848ffb2c162712bbe69412ef01df18e8ea80 Mon Sep 17 00:00:00 2001
From: Luck <git@lucko.me>
Date: Sat, 27 Nov 2021 09:43:47 +0000
Subject: [PATCH] Fix username lookup returning "null" instead of null (#3220)

---
 .../common/storage/implementation/mongodb/MongoStorage.java  | 5 ++++-
 .../common/storage/implementation/sql/SqlStorage.java        | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/mongodb/MongoStorage.java b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/mongodb/MongoStorage.java
index 3375ec411..bf595a97a 100644
--- a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/mongodb/MongoStorage.java
+++ b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/mongodb/MongoStorage.java
@@ -573,7 +573,10 @@ public class MongoStorage implements StorageImplementation {
         MongoCollection<Document> c = this.database.getCollection(this.prefix + "uuid");
         Document doc = c.find(new Document("_id", uniqueId)).first();
         if (doc != null) {
-            return doc.get("name", String.class);
+            String username = doc.get("name", String.class);
+            if (username != null && !username.equals("null")) {
+                return username;
+            }
         }
         return null;
     }
diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/SqlStorage.java b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/SqlStorage.java
index aab52eb1b..f1170da0e 100644
--- a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/SqlStorage.java
+++ b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/sql/SqlStorage.java
@@ -694,7 +694,10 @@ public class SqlStorage implements StorageImplementation {
                 ps.setString(1, uniqueId.toString());
                 try (ResultSet rs = ps.executeQuery()) {
                     if (rs.next()) {
-                        return rs.getString("username");
+                        String username = rs.getString("username");
+                        if (username != null && !username.equals("null")) {
+                            return username;
+                        }
                     }
                 }
             }