From 6a02d841a680788328607819b787c7cce42ee758 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 15 Mar 2022 21:47:04 +0100 Subject: [PATCH] added method to get mc client after dest --- serverCommunication/minecraft.go | 11 +++++++++++ serverCommunication/web.go | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/serverCommunication/minecraft.go b/serverCommunication/minecraft.go index fe54705..7765d91 100644 --- a/serverCommunication/minecraft.go +++ b/serverCommunication/minecraft.go @@ -215,6 +215,17 @@ func HandleMinecraftMessage(conn *websocket.Conn, msg []byte) { } } +func GetMinecraftClientByDest(dest int) *structs.MinecraftClient { + for _, mcClient := range cache.MinecraftClients { + if mcClient.Dest == dest { + return mcClient + } + } + + return nil +} + +// @deprecated: use GetMinecraftClientByDest instead func GetMinecraftClientByName(Name string) *structs.MinecraftClient { for name, client := range cache.MinecraftClients { if name == Name { diff --git a/serverCommunication/web.go b/serverCommunication/web.go index 8d4603e..b58365d 100644 --- a/serverCommunication/web.go +++ b/serverCommunication/web.go @@ -34,7 +34,7 @@ func HandleWebMessage(isVoice bool, conn *websocket.Conn, uuid string, msg []byt logger.WebVoice.Debugln("Reply from Web Voice", webClient.VoiceCmdIDsByBackend) for _, data := range webClient.SendVoiceQueueMessages { if data.CmdID == cmdID { // forward to target dest - mcClient := GetMinecraftClientByName(getMinecraftServerNameByDest(data.OriginDest)) + mcClient := GetMinecraftClientByDest(data.OriginDest) if mcClient == nil { logger.WebVoice.Warnln("mcClient is nil -> given dest", data.OriginDest)