From ef021c2a62072f1cf53a723fd9fa60644e2f4f2e Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 15 Mar 2022 20:54:49 +0100 Subject: [PATCH] looping through send queue messages instead of voice CMD IDs through backend --- serverCommunication/web.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/serverCommunication/web.go b/serverCommunication/web.go index b1188fc..f2b86d2 100644 --- a/serverCommunication/web.go +++ b/serverCommunication/web.go @@ -32,13 +32,13 @@ func HandleWebMessage(isVoice bool, conn *websocket.Conn, uuid string, msg []byt if status == kraProtocol.StatusReply { if isVoice { logger.WebVoice.Debugln("Reply from Web Voice", webClient.VoiceCmdIDsByBackend) - for _, data := range webClient.VoiceCmdIDsByBackend { - if data.WebCmdID == cmdID { // forward to target dest - mcClient := GetMinecraftClientByName(getMinecraftServerNameByDest(data.DestFromMinecraftServer)) + for _, data := range webClient.SendVoiceQueueMessages { + if data.CmdID == cmdID { // forward to target dest + mcClient := GetMinecraftClientByName(getMinecraftServerNameByDest(data.OriginDest)) logger.WebVoice.Debugln("Forwarding reply from web voice to mc client", mcClient.Name, "cmdID", cmdID) - raw = kraProtocol.EncodeJavaMessage(kraProtocol.StatusReply, data.CmdIDFromMinecraftServer, 0, webClient.Uuid, 0, "") + raw = kraProtocol.EncodeJavaMessage(kraProtocol.StatusReply, data.OriginCmdID, 0, webClient.Uuid, 0, "") err = mcClient.SendBinaryMessage(raw) @@ -51,7 +51,7 @@ func HandleWebMessage(isVoice bool, conn *websocket.Conn, uuid string, msg []byt webClient.RemoveVoiceCmdIDByBackend(cmdID) // remove cmdID from minecraftCmdIDs - mcClient.RemoveCmdID(data.CmdIDFromMinecraftServer) + mcClient.RemoveCmdID(data.OriginCmdID) return } }