From 114c044bf5f9ffc72c46bf2a6631ce38d2ad3480 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 29 Dec 2021 21:11:18 +0100 Subject: [PATCH] reply handling --- modules/structs/WebClient.go | 2 +- serverCommunication/minecraft.go | 4 +++- serverCommunication/web.go | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/structs/WebClient.go b/modules/structs/WebClient.go index e1b890b..2f0adfd 100644 --- a/modules/structs/WebClient.go +++ b/modules/structs/WebClient.go @@ -29,7 +29,7 @@ type WebClient struct { voiceConnMu sync.Mutex VoiceCmdIDs []int voiceCmdIDMu sync.Mutex - VoiceCMDIDsByBackend map[int]*A // messages from backend to voice, when response from voice then response to target requester + VoiceCMDIDsByBackend []*A // messages from backend to voice, when response from voice then response to target requester //voiceCMDIDsByBackendMu sync.Mutex } diff --git a/serverCommunication/minecraft.go b/serverCommunication/minecraft.go index 62df18c..c8ef8ae 100644 --- a/serverCommunication/minecraft.go +++ b/serverCommunication/minecraft.go @@ -81,7 +81,9 @@ func HandleMinecraftMessage(conn *websocket.Conn, msg []byte) { cmdID = 20 - webClient.VoiceCMDIDsByBackend[cmdID] = a + webClient.VoiceCMDIDsByBackend = append(webClient.VoiceCMDIDsByBackend, a) + + logger.Minecraft.Debugln("VoiceCMDIDsByBackend", webClient.VoiceCMDIDsByBackend) raw = kraProtocol.EncodeWebMessage(kraProtocol.StatusGet, cmdID, cmdNumber, args) } else { diff --git a/serverCommunication/web.go b/serverCommunication/web.go index 2133438..1366f31 100644 --- a/serverCommunication/web.go +++ b/serverCommunication/web.go @@ -53,7 +53,7 @@ func HandleWebMessage(isVoice bool, conn *websocket.Conn, uuid string, msg []byt } // remove cmdID from VoiceCMDIDsByBackend list - delete(webClient.VoiceCMDIDsByBackend, cmdID) + //delete(webClient.VoiceCMDIDsByBackend, cmdID) // remove cmdID from voiceCmdIDs webClient.RemoveVoiceCmdID(cmdID)