From 26ca0c578d55dca63a08eedcdda5a351aecef07b Mon Sep 17 00:00:00 2001 From: Darya Markova <122279000+Dasciam@users.noreply.github.com> Date: Wed, 8 Jan 2025 10:28:48 +0500 Subject: [PATCH 1/2] player/player.go: add empty string check in command resolution. --- server/player/player.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/server/player/player.go b/server/player/player.go index 9aef58194..78281bd6c 100644 --- a/server/player/player.go +++ b/server/player/player.go @@ -330,10 +330,17 @@ func (p *Player) ExecuteCommand(commandLine string) { return } args := strings.Split(commandLine, " ") - command, ok := cmd.ByAlias(args[0][1:]) + + name := args[0] + if name == "" { + return + } + name = name[1:] + + command, ok := cmd.ByAlias(name) if !ok { o := &cmd.Output{} - o.Errort(cmd.MessageUnknown, args[0]) + o.Errort(cmd.MessageUnknown, name) p.SendCommandOutput(o) return } From e613df4a10ca4f6116cf306f6279890056fa8728 Mon Sep 17 00:00:00 2001 From: Darya Markova <122279000+Dasciam@users.noreply.github.com> Date: Wed, 8 Jan 2025 10:48:53 +0500 Subject: [PATCH 2/2] fix: player/player.go: use strings.CutPrefix. --- server/player/player.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/server/player/player.go b/server/player/player.go index 78281bd6c..25466edce 100644 --- a/server/player/player.go +++ b/server/player/player.go @@ -331,12 +331,11 @@ func (p *Player) ExecuteCommand(commandLine string) { } args := strings.Split(commandLine, " ") - name := args[0] - if name == "" { + name, ok := strings.CutPrefix(args[0], "/") + if !ok { return } - name = name[1:] - + command, ok := cmd.ByAlias(name) if !ok { o := &cmd.Output{}