From a58d4f3e3ac31c2757878a14178148796790e84a Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 29 Dec 2021 21:13:49 +0100 Subject: [PATCH] reply handling --- modules/structs/WebClient.go | 1 + serverCommunication/minecraft.go | 4 ++-- serverCommunication/web.go | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/structs/WebClient.go b/modules/structs/WebClient.go index 2f0adfd..4501131 100644 --- a/modules/structs/WebClient.go +++ b/modules/structs/WebClient.go @@ -15,6 +15,7 @@ type WebClientDb struct { } type A struct { + WebCmdID int CmdIDFromMinecraftServer int DestFromMinecraftServer int } diff --git a/serverCommunication/minecraft.go b/serverCommunication/minecraft.go index c8ef8ae..ef665f8 100644 --- a/serverCommunication/minecraft.go +++ b/serverCommunication/minecraft.go @@ -77,9 +77,9 @@ func HandleMinecraftMessage(conn *websocket.Conn, msg []byte) { if status == kraProtocol.StatusGet { webClient := GetWebClientByUuid(playerUuid) - a := &structs.A{CmdIDFromMinecraftServer: cmdID, DestFromMinecraftServer: 10} + webCmdID := 20 - cmdID = 20 + a := &structs.A{WebCmdID: webCmdID, CmdIDFromMinecraftServer: cmdID, DestFromMinecraftServer: 10} webClient.VoiceCMDIDsByBackend = append(webClient.VoiceCMDIDsByBackend, a) diff --git a/serverCommunication/web.go b/serverCommunication/web.go index 1366f31..ede7f82 100644 --- a/serverCommunication/web.go +++ b/serverCommunication/web.go @@ -35,9 +35,9 @@ func HandleWebMessage(isVoice bool, conn *websocket.Conn, uuid string, msg []byt // TODO: TODO: handling reply - answering message to target dest (ex. GameServer-1) if isVoice { - for vCmdID, data := range webClient.VoiceCMDIDsByBackend { - logger.Web.Debugln("vCmdID range", vCmdID, data, cmdID) - if vCmdID == cmdID { + for i, data := range webClient.VoiceCMDIDsByBackend { + logger.Web.Debugln("vCmdID range", i, data, cmdID) + if data.WebCmdID == cmdID { // forward to target dest logger.Web.Debugln("forward to target dest", data)