diff --git a/globals/globals.go b/globals/globals.go index 7217761..ad10bdd 100644 --- a/globals/globals.go +++ b/globals/globals.go @@ -1,10 +1,10 @@ package globals import ( - "database/sql" + "database/sql" pb "github.com/PretendoNetwork/grpc-go/account" - "github.com/PretendoNetwork/nex-protocols-common-go/v2/globals" "github.com/PretendoNetwork/nex-go/v2" + "github.com/PretendoNetwork/nex-protocols-common-go/v2/globals" "github.com/PretendoNetwork/plogger-go" "google.golang.org/grpc" "google.golang.org/grpc/metadata" diff --git a/go.mod b/go.mod index 7202b29..c24c3ff 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.22.1 require ( github.com/PretendoNetwork/grpc-go v1.0.2 - github.com/PretendoNetwork/nex-go/v2 v2.0.2 + github.com/PretendoNetwork/nex-go/v2 v2.0.5 github.com/PretendoNetwork/nex-protocols-common-go/v2 v2.0.6 github.com/PretendoNetwork/nex-protocols-go/v2 v2.0.4 github.com/PretendoNetwork/plogger-go v1.0.4 diff --git a/go.sum b/go.sum index 3e08062..e90c2cc 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,11 @@ github.com/PretendoNetwork/grpc-go v1.0.2 h1:9TvKmX7dCOANyoHEra1MMYqS1N/RGav66TRG4SHInvo= github.com/PretendoNetwork/grpc-go v1.0.2/go.mod h1:XZjEsij9lL7HJBNkH6JPbBIkUSq/1rjflvjGdv+DAj0= -github.com/PretendoNetwork/nex-go/v2 v2.0.2 h1:mPp27Ero3Rr28nekuKg4f0tdp28NzmCJXgupt2paT18= -github.com/PretendoNetwork/nex-go/v2 v2.0.2/go.mod h1:O5v200Ro8bdrmqSAmzV0cqQsG7cdmwLHAet5X7Jxz20= +github.com/PretendoNetwork/nex-go/v2 v2.0.5 h1:S/bYPb2SNUb9MSzai4wlqj/9J1JIiLuMtZcAAbBughM= +github.com/PretendoNetwork/nex-go/v2 v2.0.5/go.mod h1:iW1xjbg/vl2c3uheitUFxGcrt0sxaDxeXR5QqDcyLpI= +github.com/PretendoNetwork/nex-protocols-common-go/v2 v2.0.6 h1:8nNJvJi5aTmGBRtEGVYAI6cjNK1WyIiF+AnGD1QyD+E= +github.com/PretendoNetwork/nex-protocols-common-go/v2 v2.0.6/go.mod h1:Mngar0XMLs7oG9KfeyVJBBhYNCNRXxDcucJTthpP9GY= +github.com/PretendoNetwork/nex-protocols-go/v2 v2.0.4 h1:7Vb/jV/cO6c8XcGzGCoowSNXjZDLb/D1lYkLk8rxm7c= +github.com/PretendoNetwork/nex-protocols-go/v2 v2.0.4/go.mod h1:2UN8khoMDNaeJ4GcIG7ez7MqqmbLfLzbVS6hSa+kGnk= github.com/PretendoNetwork/plogger-go v1.0.4 h1:PF7xHw9eDRHH+RsAP9tmAE7fG0N0p6H4iPwHKnsoXwc= github.com/PretendoNetwork/plogger-go v1.0.4/go.mod h1:7kD6M4vPq1JL4LTuPg6kuB1OvUBOwQOtAvTaUwMbwvU= github.com/PretendoNetwork/pq-extended v1.0.0 h1:GHZ0hLvCvmYKQPTV9I9XtTx8J1iB5Z9CEnfW2tUpsYg= diff --git a/init.go b/init.go index 8133cdb..1361ac5 100644 --- a/init.go +++ b/init.go @@ -1,7 +1,7 @@ package main import ( - "database/sql" + "database/sql" "fmt" "os" "strconv" diff --git a/nex/register_common_secure_server_protocols.go b/nex/register_common_secure_server_protocols.go index ed660ca..23beea4 100644 --- a/nex/register_common_secure_server_protocols.go +++ b/nex/register_common_secure_server_protocols.go @@ -3,7 +3,6 @@ package nex import ( "github.com/PretendoNetwork/nex-go/v2" "github.com/PretendoNetwork/nex-go/v2/types" -// common_globals "github.com/PretendoNetwork/nex-protocols-common-go/v2/globals" commonnattraversal "github.com/PretendoNetwork/nex-protocols-common-go/v2/nat-traversal" commonsecure "github.com/PretendoNetwork/nex-protocols-common-go/v2/secure-connection" nattraversal "github.com/PretendoNetwork/nex-protocols-go/v2/nat-traversal" @@ -83,19 +82,19 @@ func compareSearchCriteria[T ~uint16 | ~uint32](original T, search string) bool func cleanupMatchmakeSessionSearchCriteriasHandler(searchCriterias *types.List[*match_making_types.MatchmakeSessionSearchCriteria]) { for _, searchCriteria := range searchCriterias.Slice() { - searchCriteria.Attribs.SetIndex(4, types.NewString("")) + searchCriteria.Attribs.SetIndex(4, types.NewString("")) } - } +} - func onAfterAutoMatchmakeWithParamPostpone(_ nex.PacketInterface, _ *match_making_types.AutoMatchmakeParam) { - globals.MatchmakingManager.Mutex.Lock() +func onAfterAutoMatchmakeWithParamPostpone(_ nex.PacketInterface, _ *match_making_types.AutoMatchmakeParam) { + globals.MatchmakingManager.Mutex.Lock() - _, err := globals.MatchmakingManager.Database.Exec(`UPDATE matchmaking.matchmake_sessions SET open_participation=true WHERE game_mode=12`) - if err != nil { - globals.Logger.Error(err.Error()) - } + _, err := globals.MatchmakingManager.Database.Exec(`UPDATE matchmaking.matchmake_sessions SET open_participation=true WHERE game_mode=12`) + if err != nil { + globals.Logger.Error(err.Error()) + } - globals.MatchmakingManager.Mutex.Unlock() + globals.MatchmakingManager.Mutex.Unlock() } func registerCommonSecureServerProtocols() { diff --git a/nex/secure.go b/nex/secure.go index f659ef4..38451de 100644 --- a/nex/secure.go +++ b/nex/secure.go @@ -2,7 +2,7 @@ package nex import ( "fmt" - common_globals "github.com/PretendoNetwork/nex-protocols-common-go/v2/globals" + common_globals "github.com/PretendoNetwork/nex-protocols-common-go/v2/globals" "os" "strconv" diff --git a/splatoon b/splatoon index d62a747..83c8725 100755 Binary files a/splatoon and b/splatoon differ