Merge pull request #68 from PlayFab/yuehanlin/2.3.5

Release OSS PlayFab 2.3.5

OnlineSubsystemPlayFab.uplugin

@@ -1,8 +1,8 @@
 {
 	"FileVersion" : 3,
     "FriendlyName": "Online Subsystem PlayFab Party & Multiplayer",
-	"Version": 2.34,
-	"VersionName": "2.3.4",
+	"Version": 2.35,
+	"VersionName": "2.3.5",
 	"Description": "Support for the PlayFab Party and Multiplayer platform",
 	"Category": "Networking",
 	"CreatedBy": "Microsoft Corporation",

README.md

@@ -31,7 +31,7 @@ The quickstart guide for OnlineSubsystemPlayFab can be found at:
 
 |OSS Version|Release Note|
 |-|-|
-Latest Version |2.3.4|
+Latest Version |2.3.5|
 Deprecated Version |2.2.6 and 2.27 may potentially crash the game. **Please upgrade to the latest version to ensure the bug fix is included.**|
 
 ## Compatibility

Source/Private/OnlineSubsystemPlayFabPrivate.h

@@ -29,6 +29,10 @@
 #define SETTING_PLATFORM_MODEL FString(TEXT("PlatformModel"))
 #define SETTING_HOST_NICKNAME FName(TEXT("OWNERNICKNAME"))
 
+// Lobby related errors
+#define XBOX_E_LOBBY_NOT_JOINABLE 0x89236227
+#define XBOX_E_LOBBY_DOES_NOT_EXIST 0x89236226
+
 #define PLATFORM_MODEL_WINGDK FString(TEXT("WINGDK"))
 #define PLATFORM_MODEL_XSX FString(TEXT("XSX"))
 #define PLATFORM_MODEL_XB1 FString(TEXT("XB1"))

Source/Private/PlayFabLobby.cpp

@@ -1156,6 +1156,7 @@ void FPlayFabLobby::HandleJoinLobbyCompleted(const PFLobbyJoinLobbyCompletedStat
 	if (FAILED(StateChange.result))
 	{
 		UE_LOG_ONLINE(Error, TEXT("Failed to join lobby. ErrorCode=[0x%08x]"), StateChange.result);
+		JoinResult = ConvertMultiplayerErrorToJoinSessionResult(StateChange.result);
 	}
 	else
 	{
@@ -1327,7 +1328,7 @@ void FPlayFabLobby::HandleOnAddMemberCompleted(const PFLobbyAddMemberCompletedSt
 	}
 	else
 	{
-		Result = EOnJoinSessionCompleteResult::UnknownError;
+		Result = ConvertMultiplayerErrorToJoinSessionResult(StateChange.result);
 		UE_LOG_ONLINE(Error, TEXT("FPlayFabLobby::HandleOnAddMemberCompleted failed with ErrorCode=[0x%08x], Error message:%s"), StateChange.result, *GetMultiplayerErrorMessage(StateChange.result));
 	}
 	AddLocalPlayerData.RegisterLocalPlayerCompleteDelegate.ExecuteIfBound(*FUniqueNetIdPlayFab::Create(AddLocalPlayerData.PlayerPlatformId), Result);
@@ -1907,3 +1908,18 @@ const TPair<FString, EOnlineKeyValuePairDataType::Type>* FPlayFabLobby::FindSear
 {
 	return SearchKeyMappingTable.Find(SearchKey);
 }
+
+EOnJoinSessionCompleteResult::Type FPlayFabLobby::ConvertMultiplayerErrorToJoinSessionResult(
+	HRESULT result
+)
+{
+	switch (result)
+	{
+	case XBOX_E_LOBBY_NOT_JOINABLE:
+		return EOnJoinSessionCompleteResult::SessionIsFull;
+	case XBOX_E_LOBBY_DOES_NOT_EXIST:
+		return EOnJoinSessionCompleteResult::SessionDoesNotExist;
+	default:
+		return EOnJoinSessionCompleteResult::UnknownError;
+	}
+}

Source/Private/PlayFabLobby.h

@@ -110,6 +110,7 @@ class FPlayFabLobby
 	FString ComposeLobbySearchQueryFilter(const FSearchParams& SearchParams);
 	void BuildSearchKeyMappingTable();
 	bool GetSearchKeyFromSettingMappingTable(const FString& SettingKey, FString& SearchKey, EOnlineKeyValuePairDataType::Type& Type) const;
+	EOnJoinSessionCompleteResult::Type ConvertMultiplayerErrorToJoinSessionResult(HRESULT result);
 
 	// we can eliminate this map if we pass SessionName as asyncIdentifier to lobby calls
 	TMap<PFLobbyHandle, FName> LobbySessionMap;