From 6e11457c3d546840359b292383bde7689f0734b0 Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 27 Dec 2021 22:42:50 +0100 Subject: [PATCH] moved dest into kraProtocol --- modules/kraProtocol/kraProtocol.go | 9 +++++++++ serverCommunication/serverCommunication.go | 18 +++++------------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/modules/kraProtocol/kraProtocol.go b/modules/kraProtocol/kraProtocol.go index da54e0f..0c5b56d 100644 --- a/modules/kraProtocol/kraProtocol.go +++ b/modules/kraProtocol/kraProtocol.go @@ -16,6 +16,15 @@ const ( StatusReply = 16 ) +const ( + DestBackend = 1 + DestVoice = 2 + DestMobile = 3 + + DestProxy = 10 + DestPlayersCurrentServer = 11 +) + func SendMessageToClient(status int, cmdID int, cmdNumber int, args interface{}) []byte { argType := reflect.TypeOf(args).String() var argLen int diff --git a/serverCommunication/serverCommunication.go b/serverCommunication/serverCommunication.go index 1dbc24f..e227620 100644 --- a/serverCommunication/serverCommunication.go +++ b/serverCommunication/serverCommunication.go @@ -2,27 +2,19 @@ package serverCommunication import ( "github.com/gofiber/websocket/v2" + "krakatoa.net/backend/modules/kraProtocol" "krakatoa.net/backend/modules/logger" ) -const ( - DestBackend = 1 - DestVoice = 2 - DestMobile = 3 - - DestProxy = 10 - DestPlayersCurrentServer = 11 -) - func getConnForDest(dest int, uuid string) *websocket.Conn { switch dest { - case DestVoice: + case kraProtocol.DestVoice: return GetWebClientByUuid(uuid).VoiceConn - case DestMobile: + case kraProtocol.DestMobile: return GetWebClientByUuid(uuid).MobileConn - case DestProxy: + case kraProtocol.DestProxy: return GetMinecraftClientByName("proxy-1").Connection - case DestPlayersCurrentServer: + case kraProtocol.DestPlayersCurrentServer: return GetMinecraftClientByName("lobby-1").Connection default: logger.Web.Println("conn for dest is nil")