From 441a973453a05939aa689dc961dfe2bcccf3533c Mon Sep 17 00:00:00 2001
From: Beric Bearnson <37596980+bericyb@users.noreply.github.com>
Date: Thu, 24 Oct 2024 21:39:23 -0600
Subject: [PATCH] error fix

---
 internal/lobby/lobby.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/internal/lobby/lobby.go b/internal/lobby/lobby.go
index afc1ccf..7c456bc 100644
--- a/internal/lobby/lobby.go
+++ b/internal/lobby/lobby.go
@@ -314,10 +314,10 @@ func (l *Lobby) InitialConnectionHandler(conn net.Conn) (Client, []byte, error)
 	if err != nil {
 		slog.Debug("error unmarshalling name message:", "error", err.Error(), "message", msg[1:nb])
 
-		msgOut, err := Marshal(ErrorData{
+		msgOut, merr := Marshal(ErrorData{
 			Message: "incorrectly formatted username in name message",
 		}, Error)
-		if err != nil {
+		if merr != nil {
 			slog.Error("error marshalling error message for incorrectly formatted username")
 		}
 		return Client{}, msgOut, err
@@ -326,13 +326,13 @@ func (l *Lobby) InitialConnectionHandler(conn net.Conn) (Client, []byte, error)
 	_, ok := l.lobbyMembers.Load(n.Name)
 	fmt.Println("past that")
 	if ok {
-		msg, err := Marshal(ErrorData{
+		msg, merr := Marshal(ErrorData{
 			Message: "Sorry that name is already taken, please try a different name",
 		}, Error)
-		if err != nil {
+		if merr != nil {
 			slog.Error("error marshalling error on name already taken msg")
 		}
-		return Client{}, msg, err
+		return Client{}, msg, fmt.Errorf("unoriginal name :p")
 	}
 	h, err := Marshal(ConnectData{
 		From: n.Name,