Change AutoMatchmakeWithParam_Postpone to use SearchCriteria

This should allow for more precise matchmaking Also changes SearchMatchmakeSession to GameMatchmakeSession since a SearchCriteria session won't have a searchMatchmakeSession
PretendoNetwork · Oct 14, 2023 · 942f04d · 942f04d
1 parent 74e821b
commit 942f04d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/globals/matchmaking_utils.go b/globals/matchmaking_utils.go
@@ -255,7 +255,7 @@ func FindSessionsByMatchmakeSessionSearchCriterias(lstSearchCriteria []*match_ma
 							continue
 						}
 
-						if session.SearchMatchmakeSession.MinimumParticipants < uint16(min) {
+						if session.GameMatchmakeSession.MinimumParticipants < uint16(min) {
 							continue
 						}
 					}
@@ -267,7 +267,7 @@ func FindSessionsByMatchmakeSessionSearchCriterias(lstSearchCriteria []*match_ma
 							continue
 						}
 
-						if session.SearchMatchmakeSession.MinimumParticipants > uint16(max) {
+						if session.GameMatchmakeSession.MinimumParticipants > uint16(max) {
 							continue
 						}
 					}
@@ -289,7 +289,7 @@ func FindSessionsByMatchmakeSessionSearchCriterias(lstSearchCriteria []*match_ma
 							continue
 						}
 
-						if session.SearchMatchmakeSession.MaximumParticipants < uint16(min) {
+						if session.GameMatchmakeSession.MaximumParticipants < uint16(min) {
 							continue
 						}
 					}
@@ -301,7 +301,7 @@ func FindSessionsByMatchmakeSessionSearchCriterias(lstSearchCriteria []*match_ma
 							continue
 						}
 
-						if session.SearchMatchmakeSession.MaximumParticipants > uint16(max) {
+						if session.GameMatchmakeSession.MaximumParticipants > uint16(max) {
 							continue
 						}
 					}

diff --git a/matchmake-extension/auto_matchmake_with_param_postpone.go b/matchmake-extension/auto_matchmake_with_param_postpone.go
@@ -8,7 +8,7 @@ import (
 )
 
 func autoMatchmakeWithParam_Postpone(err error, client *nex.Client, callID uint32, autoMatchmakeParam *match_making_types.AutoMatchmakeParam) uint32 {
-	if commonMatchmakeExtensionProtocol.cleanupSearchMatchmakeSessionHandler == nil {
+	if commonMatchmakeExtensionProtocol.cleanupMatchmakeSessionSearchCriteriaHandler == nil {
 		logger.Warning("MatchmakeExtension::AutoMatchmake_Postpone missing CleanupSearchMatchmakeSessionHandler!")
 		return nex.Errors.Core.NotImplemented
 	}
@@ -27,20 +27,20 @@ func autoMatchmakeWithParam_Postpone(err error, client *nex.Client, callID uint3
 	var matchmakeSession *match_making_types.MatchmakeSession
 	matchmakeSession = autoMatchmakeParam.SourceMatchmakeSession
 
-	searchMatchmakeSession := matchmakeSession.Copy().(*match_making_types.MatchmakeSession)
-	commonMatchmakeExtensionProtocol.cleanupSearchMatchmakeSessionHandler(searchMatchmakeSession)
-	sessionIndex := common_globals.FindSessionByMatchmakeSession(searchMatchmakeSession)
+	commonMatchmakeExtensionProtocol.cleanupMatchmakeSessionSearchCriteriaHandler(autoMatchmakeParam.LstSearchCriteria)
+
+	sessions := common_globals.FindSessionsByMatchmakeSessionSearchCriterias(autoMatchmakeParam.LstSearchCriteria, commonMatchmakeExtensionProtocol.gameSpecificMatchmakeSessionSearchCriteriaChecksHandler)
 	var session *common_globals.CommonMatchmakeSession
 
-	if sessionIndex == 0 {
+	if len(sessions) == 0 {
 		var errCode uint32
-		session, err, errCode = common_globals.CreateSessionByMatchmakeSession(matchmakeSession, searchMatchmakeSession, client.PID())
+		session, err, errCode = common_globals.CreateSessionBySearchCriteria(matchmakeSession, autoMatchmakeParam.LstSearchCriteria, client.PID())
 		if err != nil {
 			logger.Error(err.Error())
 			return errCode
 		}
 	} else {
-		session = common_globals.Sessions[sessionIndex]
+		session = sessions[0]
 	}
 
 	err, errCode := common_globals.AddPlayersToSession(session, []uint32{client.ConnectionID()}, client, "")