From ab87246059fbf35dac0ed37c1e41e9a31df67e40 Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 12 Feb 2022 21:15:20 +0100 Subject: [PATCH] origin dest added to reply the sender after successful reply of the target dest --- serverCommunication/minecraft.go | 2 +- serverCommunication/web.go | 29 ----------------------------- 2 files changed, 1 insertion(+), 30 deletions(-) diff --git a/serverCommunication/minecraft.go b/serverCommunication/minecraft.go index 8100af6..960b28a 100644 --- a/serverCommunication/minecraft.go +++ b/serverCommunication/minecraft.go @@ -31,7 +31,7 @@ func HandleMinecraftMessage(conn *websocket.Conn, msg []byte) { if mcClient.IsCmdIDInSendMessagesQueue(cmdID) { queueMsg, err := mcClient.GetMessageFromSendQueueByCmdID(cmdID) - logger.Minecraft.Debugln("IsCmdIDInSendMessagesQueue queueMsg", queueMsg) + logger.Minecraft.Debugln("IsCmdIDInSendMessagesQueue queueMsg", queueMsg.OriginDest, queueMsg.OriginDest) if err != nil { return diff --git a/serverCommunication/web.go b/serverCommunication/web.go index 7124db9..2a810b7 100644 --- a/serverCommunication/web.go +++ b/serverCommunication/web.go @@ -121,7 +121,6 @@ func HandleWebMessage(isVoice bool, conn *websocket.Conn, uuid string, msg []byt } } - // no ack if dest == kraProtocol.DestProxy || dest == kraProtocol.DestPlayersCurrentServer { // forwarding message to java / minecraft var originDest int @@ -215,34 +214,6 @@ func HandleWebMessage(isVoice bool, conn *websocket.Conn, uuid string, msg []byt } } } - - /* TODO: delete cmdID if ack was answered - if webClient != nil { // remove cmdID from list - if isVoice { - webClient.RemoveVoiceCmdID(cmdID) - } else { - webClient.RemoveMobileCmdID(cmdID) - } - - /*var newArr []int - if isVoice { - newArr, err = removeCmdIDFromList(client.VoiceCmdIDs, cmdID) - - if err != nil { - logger.WebVoice.Warnln("removeCmdIDFromList:", err) - } else { - client.VoiceCmdIDs = newArr - } - } else { - newArr, err = removeCmdIDFromList(client.MobileCmdIDs, cmdID) - - if err != nil { - logger.WebMobile.Warnln("removeCmdIDFromList:", err) - } else { - client.MobileCmdIDs = newArr - } - } - } */ } func voiceCommandHandler(cmdNumber int, uuid string) (args string) {