From 80964978bc95b9539db4d8930f2efc2c2ab49089 Mon Sep 17 00:00:00 2001
From: Hutchy <hutchy5225@gmail.com>
Date: Tue, 31 Mar 2020 15:50:13 +1100
Subject: [PATCH] Fixed NPE when checking username (#153)

---
 .../java/com/griefdefender/cache/PermissionHolderCache.java    | 2 +-
 .../java/com/griefdefender/cache/PermissionHolderCache.java    | 2 +-
 .../src/main/java/com/griefdefender/internal/util/NMSUtil.java | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bukkit/src/main/java/com/griefdefender/cache/PermissionHolderCache.java b/bukkit/src/main/java/com/griefdefender/cache/PermissionHolderCache.java
index 6b0f9ea..cf0a610 100644
--- a/bukkit/src/main/java/com/griefdefender/cache/PermissionHolderCache.java
+++ b/bukkit/src/main/java/com/griefdefender/cache/PermissionHolderCache.java
@@ -79,7 +79,7 @@ public GDPermissionUser getOrCreateUser(UUID uuid) {
     }
 
     public GDPermissionUser getOrCreateUser(String username) {
-        if (username == null) {
+        if (username == null || username.length() > 16) {
             return null;
         }
 
diff --git a/sponge/src/main/java/com/griefdefender/cache/PermissionHolderCache.java b/sponge/src/main/java/com/griefdefender/cache/PermissionHolderCache.java
index a74f417..d0b8588 100644
--- a/sponge/src/main/java/com/griefdefender/cache/PermissionHolderCache.java
+++ b/sponge/src/main/java/com/griefdefender/cache/PermissionHolderCache.java
@@ -82,7 +82,7 @@ public GDPermissionUser getOrCreateUser(UUID uuid) {
     }
 
     public GDPermissionUser getOrCreateUser(String username) {
-        if (username == null) {
+        if (username == null || username.length() > 16) {
             return null;
         }
 
diff --git a/sponge/src/main/java/com/griefdefender/internal/util/NMSUtil.java b/sponge/src/main/java/com/griefdefender/internal/util/NMSUtil.java
index e2f384f..47f978c 100644
--- a/sponge/src/main/java/com/griefdefender/internal/util/NMSUtil.java
+++ b/sponge/src/main/java/com/griefdefender/internal/util/NMSUtil.java
@@ -4,6 +4,7 @@
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 import com.griefdefender.GriefDefenderPlugin;
+import com.griefdefender.api.GriefDefender;
 import com.griefdefender.api.claim.ClaimTypes;
 import com.griefdefender.api.permission.flag.Flag;
 import com.griefdefender.api.permission.flag.Flags;
@@ -168,7 +169,7 @@ public User createUserFromCache(UUID uuid) {
 
     public User createUserFromCache(String username) {
         final UUID uuid = SpongeUsernameCache.getLastKnownUUID(username);
-        if (username != null) {
+        if (uuid != null) {
             return Sponge.getGame().getServiceManager().provide(UserStorageService.class).get().get(GameProfile.of(uuid, username)).orElse(null);
         }
         return null;