From c5b356e45add8e41668a47847f7edb4acc8b7168 Mon Sep 17 00:00:00 2001 From: Deauthorized <49701242+Deauthorized@users.noreply.github.com> Date: Mon, 6 May 2024 15:51:04 -0400 Subject: [PATCH] fix merge conflict for hopefully the last time --- server/src/main/java/dev/plex/command/impl/BanCMD.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/dev/plex/command/impl/BanCMD.java b/server/src/main/java/dev/plex/command/impl/BanCMD.java index bd74b02..5a965a8 100644 --- a/server/src/main/java/dev/plex/command/impl/BanCMD.java +++ b/server/src/main/java/dev/plex/command/impl/BanCMD.java @@ -135,9 +135,9 @@ public class BanCMD extends PlexCommand { return PlexUtils.getPlayerNameList(); } - if (args.length != 1 && silentCheckPermission(sender, this.getPermission())) + if (args.length > 1 && silentCheckPermission(sender, this.getPermission())) { - return Collections.singletonList("-nrb"); + return Collections.singletonList("-rb"); } return Collections.emptyList(); }