diff --git a/src/main/java/com/cssbham/minecraftcore/commands/CommandMakeGreen.java b/src/main/java/com/cssbham/minecraftcore/commands/CommandMakeGreen.java index 4cdd925..dd355ff 100644 --- a/src/main/java/com/cssbham/minecraftcore/commands/CommandMakeGreen.java +++ b/src/main/java/com/cssbham/minecraftcore/commands/CommandMakeGreen.java @@ -27,7 +27,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command return true; } String arg = String.join(" ", args); - if (!arg.matches(".{2,32}#[0-9]{4}")) { + if (!arg.matches("[a-z0-9._]{2,32}|.{2,32}#[0-9]{4}")) { return false; } diff --git a/src/main/java/com/cssbham/minecraftcore/discord/DiscordBridge.java b/src/main/java/com/cssbham/minecraftcore/discord/DiscordBridge.java index ffe8318..1390783 100644 --- a/src/main/java/com/cssbham/minecraftcore/discord/DiscordBridge.java +++ b/src/main/java/com/cssbham/minecraftcore/discord/DiscordBridge.java @@ -101,7 +101,8 @@ public boolean isMember(String identifier) { if (g == null) return false; Member m = g.getMembers().stream() .filter(mm -> - (mm.getUser().getName() + "#" + mm.getUser().getDiscriminator()).equalsIgnoreCase(identifier) + (mm.getUser().getName() + "#" + mm.getUser().getDiscriminator()).equalsIgnoreCase(identifier) || + mm.getUser().getName().equalsIgnoreCase(identifier) ).findFirst().orElse(null); if (m == null) return false; return m.getRoles().stream().anyMatch(r -> r.getIdLong() == MEMBER_ROLE_ID); diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 3fda1d5..750230d 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -10,5 +10,5 @@ depend: [ LuckPerms ] commands: makegreen: description: Make yourself green by verifying your CSS membership. - usage: / [Discord Username#1234] + usage: / [Discord Username] aliases: [ mg, green ]