From 762708fd29724dfa40c0966e73cf89a0ff5c3f2d Mon Sep 17 00:00:00 2001
From: Sandertv <st.ten.veldhuis@gmail.com>
Date: Wed, 27 Nov 2024 19:34:14 +0100
Subject: [PATCH] cmd/command.go: Force name and aliases to lowercase to
 prevent client crashes. Fixes #946.

---
 server/cmd/command.go | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/server/cmd/command.go b/server/cmd/command.go
index efa1c97a3..329212009 100644
--- a/server/cmd/command.go
+++ b/server/cmd/command.go
@@ -6,6 +6,7 @@ import (
 	"github.com/df-mc/dragonfly/server/world"
 	"go/ast"
 	"reflect"
+	"slices"
 	"strings"
 )
 
@@ -51,25 +52,23 @@ type Command struct {
 	aliases     []string
 }
 
-// New returns a new Command using the name and description passed. The Runnable passed must be a
-// (pointer to a) struct, with its fields representing the parameters of the command.
-// When the command is run, the Run method of the Runnable will be called, after all fields have their values
-// from the parsed command set.
-// If r is not a struct or a pointer to a struct, New panics.
+// New returns a new Command using the name and description passed. Command
+// names and aliases are all converted to lowercase. The Runnable passed must
+// be a (pointer to a) struct, with its fields representing the parameters of
+// the command. When the command is run, the Run method of the Runnable will be
+// called after all fields have their values from the parsed command set. If r
+// is not a struct or a pointer to a struct, New panics.
 func New(name, description string, aliases []string, r ...Runnable) Command {
+	name = strings.ToLower(name)
+	for i, alias := range aliases {
+		aliases[i] = strings.ToLower(alias)
+	}
+
 	usages := make([]string, len(r))
 	runnableValues := make([]reflect.Value, len(r))
 
-	if len(aliases) > 0 {
-		namePresent := false
-		for _, alias := range aliases {
-			if alias == name {
-				namePresent = true
-			}
-		}
-		if !namePresent {
-			aliases = append(aliases, name)
-		}
+	if len(aliases) > 0 && slices.Index(aliases, name) != -1 {
+		aliases = append(aliases, name)
 	}
 
 	for i, runnable := range r {