diff --git a/modules/kraProtocol/kraProtocol.go b/modules/kraProtocol/kraProtocol.go index 0c5b56d..cfb560b 100644 --- a/modules/kraProtocol/kraProtocol.go +++ b/modules/kraProtocol/kraProtocol.go @@ -25,7 +25,7 @@ const ( DestPlayersCurrentServer = 11 ) -func SendMessageToClient(status int, cmdID int, cmdNumber int, args interface{}) []byte { +func EncodeWebMessage(status int, cmdID int, cmdNumber int, args interface{}) []byte { argType := reflect.TypeOf(args).String() var argLen int var kraProtocolMessageToClientData structs.KraProtocolMessageToClient diff --git a/serverCommunication/minecraft.go b/serverCommunication/minecraft.go index 7391664..7bc8c99 100644 --- a/serverCommunication/minecraft.go +++ b/serverCommunication/minecraft.go @@ -49,7 +49,7 @@ func HandleMinecraftMessage(conn *websocket.Conn, status int, cmdID int, dest in destConn := getConnForDest(dest, playerUuid) if destConn != nil { - raw = kraProtocol.SendMessageToClient(status, cmdID, cmdNumber, args) + raw = kraProtocol.EncodeWebMessage(status, cmdID, cmdNumber, args) err = destConn.WriteMessage(websocket.BinaryMessage, raw) diff --git a/serverCommunication/web.go b/serverCommunication/web.go index 29d6672..9367ff2 100644 --- a/serverCommunication/web.go +++ b/serverCommunication/web.go @@ -25,7 +25,7 @@ func HandleWebMessage(isVoice bool, conn *websocket.Conn, uuid string, status in client = getWebClientByConn(conn) if client == nil { - raw = kraProtocol.SendMessageToClient(kraProtocol.StatusErrTryAgain, cmdID, cmdNumber, "") + raw = kraProtocol.EncodeWebMessage(kraProtocol.StatusErrTryAgain, cmdID, cmdNumber, "") err = client.SendBinaryMessage(conn, raw) @@ -45,7 +45,7 @@ func HandleWebMessage(isVoice bool, conn *websocket.Conn, uuid string, status in } if cmdIDInList { // cmdID already in queue - raw = kraProtocol.SendMessageToClient(kraProtocol.StatusMessageAlreadyInQueue, cmdID, cmdNumber, "") + raw = kraProtocol.EncodeWebMessage(kraProtocol.StatusMessageAlreadyInQueue, cmdID, cmdNumber, "") err = client.SendBinaryMessage(conn, raw) diff --git a/servers/web/socketHub.go b/servers/web/socketHub.go index bd49c7b..0a34393 100644 --- a/servers/web/socketHub.go +++ b/servers/web/socketHub.go @@ -93,7 +93,7 @@ func Test() { for { for _, client := range cache.WebClients { - raw := kraProtocol.SendMessageToClient(1, 1, 2, "this a test ping") + raw := kraProtocol.EncodeWebMessage(1, 1, 2, "this a test ping") if client.VoiceConn != nil { client.SendBinaryMessage(client.VoiceConn, raw)