Upstream/GriefDefender
1
0
Fork 0
mirror of https://github.com/bloodmc/GriefDefender.git synced 2024-09-28 04:37:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed NPE when checking username (#153)

Browse Source
This commit is contained in:
Hutchy 2020-03-31 15:50:13 +11:00 committed by GitHub
parent 189187fd25
commit 80964978bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bukkit/src/main/java/com/griefdefender/cache/PermissionHolderCache.java vendored
View File

@ -79,7 +79,7 @@ public GDPermissionUser getOrCreateUser(UUID uuid) {
} }
public GDPermissionUser getOrCreateUser(String username) { public GDPermissionUser getOrCreateUser(String username) {
if (username == null) { if (username == null || username.length() > 16) {
return null; return null;
} }

2
sponge/src/main/java/com/griefdefender/cache/PermissionHolderCache.java vendored
View File

@ -82,7 +82,7 @@ public GDPermissionUser getOrCreateUser(UUID uuid) {
} }
public GDPermissionUser getOrCreateUser(String username) { public GDPermissionUser getOrCreateUser(String username) {
if (username == null) { if (username == null || username.length() > 16) {
return null; return null;
} }

3
sponge/src/main/java/com/griefdefender/internal/util/NMSUtil.java
View File

@ -4,6 +4,7 @@
import com.google.common.collect.BiMap; import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap; import com.google.common.collect.HashBiMap;
import com.griefdefender.GriefDefenderPlugin; import com.griefdefender.GriefDefenderPlugin;
import com.griefdefender.api.GriefDefender;
import com.griefdefender.api.claim.ClaimTypes; import com.griefdefender.api.claim.ClaimTypes;
import com.griefdefender.api.permission.flag.Flag; import com.griefdefender.api.permission.flag.Flag;
import com.griefdefender.api.permission.flag.Flags; import com.griefdefender.api.permission.flag.Flags;
@ -168,7 +169,7 @@ public User createUserFromCache(UUID uuid) {
public User createUserFromCache(String username) { public User createUserFromCache(String username) {
final UUID uuid = SpongeUsernameCache.getLastKnownUUID(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 Sponge.getGame().getServiceManager().provide(UserStorageService.class).get().get(GameProfile.of(uuid, username)).orElse(null);
} }
return null; return null;