From 6e0b0a1b55a9c10f26ec46966bd5431eaa2a12b9 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 20 Apr 2014 18:58:00 +1000 Subject: Don't special case 'invalid' usernames for UUIDs. --- src/main/java/org/bukkit/craftbukkit/CraftServer.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java index 9f404c1a..c0ebdf1a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -170,8 +170,6 @@ public final class CraftServer implements Server { private CraftIconCache icon; private boolean overrideAllCommandBlockCommands = false; private boolean unrestrictedAdvancements; - private final Pattern validUserPattern = Pattern.compile("^[a-zA-Z0-9_]{2,16}$"); - private final UUID invalidUserUUID = UUID.nameUUIDFromBytes("InvalidUsername".getBytes(Charsets.UTF_8)); private final List playerView; public int reloadCount; @@ -1246,11 +1244,6 @@ public final class CraftServer implements Server { public OfflinePlayer getOfflinePlayer(String name) { Validate.notNull(name, "Name cannot be null"); - // If the name given cannot ever be a valid username give a dummy return, for scoreboard plugins - if (!validUserPattern.matcher(name).matches()) { - return new CraftOfflinePlayer(this, new GameProfile(invalidUserUUID, name)); - } - OfflinePlayer result = getPlayerExact(name); if (result == null) { // This is potentially blocking :( -- cgit v1.2.3