From 6b8a6008fbfee2f0bbf92fdb894c578e049949be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Dufrene?= <43671109+itsme-to@users.noreply.github.com> Date: Wed, 9 Jul 2025 18:07:25 +0200 Subject: [PATCH 1/2] Fix formatCommand to handle empty args correctly --- .../earth2me/essentials/commands/Commandclearinventory.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandclearinventory.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandclearinventory.java index 3a284ff0c6a..0ef257d5ceb 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandclearinventory.java +++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandclearinventory.java @@ -196,7 +196,9 @@ protected List getTabCompleteOptions(final Server server, final CommandS } private String formatCommand(final String commandLabel, final String[] args) { - return "/" + commandLabel + " " + StringUtil.joinList(" ", (Object[]) args); + return args.length == 0 + ? "/" + commandLabel + : "/" + commandLabel + " " + StringUtil.joinList(" ", (Object[]) args); } private enum ClearHandlerType { From ceaeb1328ae1d95bda6675ba18ab7092c3387f43 Mon Sep 17 00:00:00 2001 From: Josh Roy <10731363+JRoy@users.noreply.github.com> Date: Wed, 9 Jul 2025 11:08:52 -0700 Subject: [PATCH 2/2] Apply suggestion from @Copilot Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .../essentials/commands/Commandclearinventory.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandclearinventory.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandclearinventory.java index 0ef257d5ceb..c3b19adb8ff 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandclearinventory.java +++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandclearinventory.java @@ -196,9 +196,10 @@ protected List getTabCompleteOptions(final Server server, final CommandS } private String formatCommand(final String commandLabel, final String[] args) { - return args.length == 0 - ? "/" + commandLabel - : "/" + commandLabel + " " + StringUtil.joinList(" ", (Object[]) args); + if (args == null || args.length == 0) { + return "/" + commandLabel; + } + return "/" + commandLabel + " " + StringUtil.joinList(" ", (Object[]) args); } private enum ClearHandlerType {