Krakatoa-Earth
/
Backend
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

looping through send queue messages instead of voice CMD IDs through backend

master
Alex 2022-03-15 20:54:49 +01:00
parent f8b4b26a04
commit ef021c2a62
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
serverCommunication/web.go
View File

@ -32,13 +32,13 @@ func HandleWebMessage(isVoice bool, conn *websocket.Conn, uuid string, msg []byt
if status == kraProtocol.StatusReply { if status == kraProtocol.StatusReply {
if isVoice { if isVoice {
logger.WebVoice.Debugln("Reply from Web Voice", webClient.VoiceCmdIDsByBackend) logger.WebVoice.Debugln("Reply from Web Voice", webClient.VoiceCmdIDsByBackend)
for _, data := range webClient.VoiceCmdIDsByBackend { for _, data := range webClient.SendVoiceQueueMessages {
if data.WebCmdID == cmdID { // forward to target dest if data.CmdID == cmdID { // forward to target dest
mcClient := GetMinecraftClientByName(getMinecraftServerNameByDest(data.DestFromMinecraftServer)) mcClient := GetMinecraftClientByName(getMinecraftServerNameByDest(data.OriginDest))
logger.WebVoice.Debugln("Forwarding reply from web voice to mc client", mcClient.Name, "cmdID", cmdID) 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) err = mcClient.SendBinaryMessage(raw)
@ -51,7 +51,7 @@ func HandleWebMessage(isVoice bool, conn *websocket.Conn, uuid string, msg []byt
webClient.RemoveVoiceCmdIDByBackend(cmdID) webClient.RemoveVoiceCmdIDByBackend(cmdID)
// remove cmdID from minecraftCmdIDs // remove cmdID from minecraftCmdIDs
mcClient.RemoveCmdID(data.CmdIDFromMinecraftServer) mcClient.RemoveCmdID(data.OriginCmdID)
return return
} }
} }