diff --git a/src/main/java/com/massivecraft/massivecore/store/SenderColl.java b/src/main/java/com/massivecraft/massivecore/store/SenderColl.java index b44b017f..6353feec 100644 --- a/src/main/java/com/massivecraft/massivecore/store/SenderColl.java +++ b/src/main/java/com/massivecraft/massivecore/store/SenderColl.java @@ -57,12 +57,8 @@ public class SenderColl> extends Coll implements Se if (ret == null) { - ret = IdUtil.getId(oid); - } - - if (ret == null) - { - return null; + // Always lower case. + return IdUtil.getId(oid); } if (this.isLowercasing()) diff --git a/src/main/java/com/massivecraft/massivecore/util/IdUtil.java b/src/main/java/com/massivecraft/massivecore/util/IdUtil.java index 3b470baa..5f23fb19 100644 --- a/src/main/java/com/massivecraft/massivecore/util/IdUtil.java +++ b/src/main/java/com/massivecraft/massivecore/util/IdUtil.java @@ -598,6 +598,7 @@ public class IdUtil implements Listener, Runnable return null; } + // This method always returns null or a lower case String. public static String getId(Object senderObject) { // Null Return @@ -623,7 +624,7 @@ public class IdUtil implements Listener, Runnable if (senderObject instanceof Player) return ((Player)senderObject).getUniqueId().toString(); // CommandSender - if (senderObject instanceof CommandSender) return ((CommandSender)senderObject).getName(); + if (senderObject instanceof CommandSender) return ((CommandSender)senderObject).getName().toLowerCase(); // UUID if (senderObject instanceof UUID) return ((UUID)senderObject).toString();