Adding function to get the net id of a session owner

update session add advertisement
fix multiple session results when searching both dedicated and lobbies
2025-10-26 01:44:20 +00:00 · 2025-09-26 08:37:07 -04:00 · 2023-07-26 08:53:58 -04:00 · 2023-01-25 15:01:00 -05:00 · 2022-08-30 08:42:18 -04:00 · 2022-08-22 15:11:22 -04:00
65 changed files with 4859 additions and 5277 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +0,0 @@
-* text=auto
-*.bat eol=crlf
--- a/AdvancedSessions/AdvancedSessions.uplugin
+++ b/AdvancedSessions/AdvancedSessions.uplugin
@@ -1,19 +1,22 @@
 {
-	"FileVersion": 3,
-	"FriendlyName": "Advanced Sessions",
-	"Version": 5.1,
-	"VersionName": "5.1",
-	"Description": "Adds new blueprint functions to handle more advanced session operations.",
-	"Category": "Advanced Sessions Plugin",
-	"CreatedBy": "Joshua Statzer",
-	"CreatedByURL": "N/A",
-	"Modules": [
-		{
-			"Name": "AdvancedSessions",
-			"Type": "Runtime",
-			"LoadingPhase": "PreDefault"
-		}
-	],
+    "FileVersion" : 3,
+ 
+    "FriendlyName" : "Advanced Sessions",
+    "Version" : 4.27,
+    "VersionName": "4.27",
+    "Description" : "Adds new blueprint functions to handle more advanced session operations.",
+    "Category" : "Advanced Sessions Plugin",
+    "CreatedBy" : "Joshua Statzer",
+    "CreatedByURL" : "N/A",
+ 
+    "Modules" :
+    [
+        {
+            "Name" : "AdvancedSessions",
+            "Type" : "RunTime",
+			"LoadingPhase" : "PreDefault"
+        } 
+    ],
 	"Plugins": [
 		{
 			"Name": "OnlineSubsystem",
@@ -23,12 +26,5 @@
 			"Name": "OnlineSubsystemUtils",
 			"Enabled": true
 		}
-	],
-	"DocsURL": "",
-	"MarketplaceURL": "",
-	"SupportURL": "",
-	"CanContainContent": false,
-	"IsBetaVersion": false,
-	"IsExperimentalVersion": false,
-	"Installed": false
+	]
 }
--- a/AdvancedSessions/Config/FilterPlugin.ini
+++ b/AdvancedSessions/Config/FilterPlugin.ini
@@ -1,8 +0,0 @@
-[FilterPlugin]
-; This section lists additional files which will be packaged along with your plugin. Paths should be listed relative to the root plugin directory, and
-; may include "...", "*", and "?" wildcards to match directories, files, and individual characters respectively.
-;
-; Examples:
-;    /README.txt
-;    /Extras/...
-;    /Binaries/ThirdParty/*.dll
--- a/AdvancedSessions/Source/AdvancedSessions/AdvancedSessions.Build.cs
+++ b/AdvancedSessions/Source/AdvancedSessions/AdvancedSessions.Build.cs
@@ -13,5 +13,6 @@ public class AdvancedSessions : ModuleRules
       // PrivateIncludePaths.AddRange(new string[] { "AdvancedSessions/Private"/*, "OnlineSubsystemSteam/Private"*/ });
       // PublicIncludePaths.AddRange(new string[] { "AdvancedSessions/Public" });
        PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore", "OnlineSubsystem", "CoreUObject", "OnlineSubsystemUtils", "Networking", "Sockets"/*"Voice", "OnlineSubsystemSteam"*/ });
+        PrivateDependencyModuleNames.AddRange(new string[] { "OnlineSubsystem", "Sockets", "Networking", "OnlineSubsystemUtils" /*"Voice", "Steamworks","OnlineSubsystemSteam"*/});
    }
 }
--- a/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedExternalUILibrary.h
+++ b/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedExternalUILibrary.h
@@ -32,32 +32,32 @@ public:
 	//********* External UI Functions *************//

 	// Show the UI that handles the Friends list
-	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedExternalUI", meta = (ExpandEnumAsExecs = "Result", WorldContext = "WorldContextObject"))
-	static void ShowFriendsUI(UObject* WorldContextObject, APlayerController *PlayerController, EBlueprintResultSwitch &Result);
+	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedExternalUI", meta = (ExpandEnumAsExecs = "Result"))
+	static void ShowFriendsUI(APlayerController *PlayerController, EBlueprintResultSwitch &Result);

 	// Show the UI that handles inviting people to your game
-	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedExternalUI", meta = (ExpandEnumAsExecs = "Result", WorldContext = "WorldContextObject"))
-	static void ShowInviteUI(UObject* WorldContextObject, APlayerController *PlayerController, EBlueprintResultSwitch &Result);
+	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedExternalUI", meta = (ExpandEnumAsExecs = "Result"))
+	static void ShowInviteUI(APlayerController *PlayerController, EBlueprintResultSwitch &Result);

 	// Show the UI that shows the leaderboard (doesn't work with steam)
-	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedExternalUI", meta = (ExpandEnumAsExecs = "Result", WorldContext = "WorldContextObject"))
-	static void ShowLeaderBoardUI(UObject* WorldContextObject, FString LeaderboardName, EBlueprintResultSwitch &Result);
+	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedExternalUI", meta = (ExpandEnumAsExecs = "Result"))
+	static void ShowLeaderBoardUI(FString LeaderboardName, EBlueprintResultSwitch &Result);

 	// Show the UI that shows a web URL
-	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedExternalUI", meta = (ExpandEnumAsExecs = "Result", AutoCreateRefTerm = "AllowedDomains", WorldContext = "WorldContextObject"))
-	static void ShowWebURLUI(UObject* WorldContextObject, FString URLToShow, EBlueprintResultSwitch &Result, TArray<FString>& AllowedDomains, bool bEmbedded = false , bool bShowBackground = false, bool bShowCloseButton = false, int32 OffsetX = 0, int32 OffsetY = 0, int32 SizeX = 0, int32 SizeY = 0);
+	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedExternalUI", meta = (ExpandEnumAsExecs = "Result", AutoCreateRefTerm = "AllowedDomains"))
+	static void ShowWebURLUI(FString URLToShow, EBlueprintResultSwitch &Result, TArray<FString>& AllowedDomains, bool bEmbedded = false , bool bShowBackground = false, bool bShowCloseButton = false, int32 OffsetX = 0, int32 OffsetY = 0, int32 SizeX = 0, int32 SizeY = 0);

 	// Show the UI that shows a web URL
-	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedExternalUI", meta = (WorldContext = "WorldContextObject"))
-	static void CloseWebURLUI(UObject* WorldContextObject);
+	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedExternalUI")
+	static void CloseWebURLUI();


 	// Show the UI that shows the profile of a uniquenetid
-	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedExternalUI", meta = (ExpandEnumAsExecs = "Result", WorldContext = "WorldContextObject"))
-	static void ShowProfileUI(UObject* WorldContextObject, const FBPUniqueNetId PlayerViewingProfile, const FBPUniqueNetId PlayerToViewProfileOf, EBlueprintResultSwitch &Result);
+	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedExternalUI", meta = (ExpandEnumAsExecs = "Result"))
+	static void ShowProfileUI(const FBPUniqueNetId PlayerViewingProfile, const FBPUniqueNetId PlayerToViewProfileOf, EBlueprintResultSwitch &Result);

 	// Show the UI that shows the account upgrade UI (doesn't work with steam)
-	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedExternalUI", meta = (ExpandEnumAsExecs = "Result", WorldContext = "WorldContextObject"))
-	static void ShowAccountUpgradeUI(UObject* WorldContextObject, const FBPUniqueNetId PlayerRequestingAccountUpgradeUI, EBlueprintResultSwitch &Result);
+	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedExternalUI", meta = (ExpandEnumAsExecs = "Result"))
+	static void ShowAccountUpgradeUI(const FBPUniqueNetId PlayerRequestingAccountUpgradeUI, EBlueprintResultSwitch &Result);

 };	
--- a/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedIdentityLibrary.h
+++ b/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedIdentityLibrary.h
@@ -28,26 +28,26 @@ public:
 	//********* Identity Functions *************//

 	// Get the login status of a local player
-	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedIdentity", meta = (ExpandEnumAsExecs = "Result", WorldContext = "WorldContextObject"))
-	static void GetLoginStatus(UObject* WorldContextObject, const FBPUniqueNetId & UniqueNetID, EBPLoginStatus & LoginStatus, EBlueprintResultSwitch &Result);
+	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedIdentity", meta = (ExpandEnumAsExecs = "Result"))
+	static void GetLoginStatus(const FBPUniqueNetId & UniqueNetID, EBPLoginStatus & LoginStatus, EBlueprintResultSwitch &Result);

 	// Get the auth token for a local player
-	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedIdentity", meta = (ExpandEnumAsExecs = "Result", WorldContext = "WorldContextObject"))
-	static void GetPlayerAuthToken(UObject* WorldContextObject, APlayerController * PlayerController, FString & AuthToken, EBlueprintResultSwitch &Result);
+	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedIdentity", meta = (ExpandEnumAsExecs = "Result"))
+	static void GetPlayerAuthToken(APlayerController * PlayerController, FString & AuthToken, EBlueprintResultSwitch &Result);

 	// Get a players nickname
-	UFUNCTION(BlueprintPure, Category = "Online|AdvancedIdentity", meta = (WorldContext = "WorldContextObject"))
-	static void GetPlayerNickname(UObject* WorldContextObject, const FBPUniqueNetId & UniqueNetID, FString & PlayerNickname);
+	UFUNCTION(BlueprintPure, Category = "Online|AdvancedIdentity")
+	static void GetPlayerNickname(const FBPUniqueNetId & UniqueNetID, FString & PlayerNickname);

 	//********* User Account Functions *************//

 	// Get a users account
-	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedIdentity|UserAccount", meta = (ExpandEnumAsExecs = "Result", WorldContext = "WorldContextObject"))
-	static void GetUserAccount(UObject* WorldContextObject, const FBPUniqueNetId & UniqueNetId, FBPUserOnlineAccount & AccountInfo, EBlueprintResultSwitch &Result);
+	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedIdentity|UserAccount", meta = (ExpandEnumAsExecs = "Result"))
+	static void GetUserAccount(const FBPUniqueNetId & UniqueNetId, FBPUserOnlineAccount & AccountInfo, EBlueprintResultSwitch &Result);

 	// Get all known users accounts
-	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedIdentity|UserAccount", meta = (ExpandEnumAsExecs = "Result", WorldContext = "WorldContextObject"))
-	static void GetAllUserAccounts(UObject* WorldContextObject, TArray<FBPUserOnlineAccount> & AccountInfos, EBlueprintResultSwitch &Result);
+	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedIdentity|UserAccount", meta = (ExpandEnumAsExecs = "Result"))
+	static void GetAllUserAccounts(TArray<FBPUserOnlineAccount> & AccountInfos, EBlueprintResultSwitch &Result);

 	// Get a user account access token
 	UFUNCTION(BlueprintPure, Category = "Online|AdvancedIdentity|UserAccount")
--- a/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedSessionsLibrary.h
+++ b/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedSessionsLibrary.h
@@ -160,6 +160,10 @@ public:
 		UFUNCTION(BlueprintPure, Category = "Online|AdvancedSessions|PlayerInfo|PlayerID")
 		static void GetUniqueNetID(APlayerController *PlayerController, FBPUniqueNetId &UniqueNetId);

+		// Get the unique net id of a network player attached to the given controller
+		UFUNCTION(BlueprintPure, Category = "Online|AdvancedSessions|PlayerInfo|PlayerID")
+		static void GetUniqueNetIdOfSessionOwner(FBlueprintSessionResult SessionResult, FBPUniqueNetId& UniqueNetId);
+
 		// Get the unique net id of a network player who is assigned the the given player state
 		UFUNCTION(BlueprintPure, Category = "Online|AdvancedSessions|PlayerInfo|PlayerID")
 		static void GetUniqueNetIDFromPlayerState(APlayerState *PlayerState, FBPUniqueNetId &UniqueNetId);
@@ -172,10 +176,6 @@ public:
 		UFUNCTION(BlueprintPure, meta = (DisplayName = "Equal Unique Net ID", CompactNodeTitle = "==", Keywords = "== equal"), Category = "Online|AdvancedSessions|PlayerInfo|PlayerID")
 		static bool EqualEqual_UNetIDUnetID(const FBPUniqueNetId &A, const FBPUniqueNetId &B);

-		/** Converts a FBPUniqueNetID into a FUniqueNetID_Repl */
-		UFUNCTION(BlueprintPure, meta = (DisplayName = "ToUniqueNetIDRepl (Unique Net ID)", CompactNodeTitle = "->", BlueprintAutocast), Category = "Online|AdvancedSessions|PlayerInfo|PlayerID")
-			static FUniqueNetIdRepl Conv_BPUniqueIDToUniqueNetIDRepl(const FBPUniqueNetId& InUniqueID);
-
 		// Check if a UniqueNetId is a friend
 		UFUNCTION(BlueprintPure, Category = "Online|AdvancedSessions|UniqueNetId")
 		static void UniqueNetIdToString(const FBPUniqueNetId &UniqueNetId, FString &String);
@@ -210,4 +210,5 @@ public:
 		UFUNCTION(BlueprintCallable, BlueprintAuthorityOnly, Category = "Online|AdvancedSessions|Seamless", meta = (HidePin = "WorldContextObject", DefaultToSelf = "WorldContextObject"))
 		static bool ServerTravel(UObject* WorldContextObject, const FString& InURL, bool bAbsolute, bool bShouldSkipGameNotify);

+		
 };	
--- a/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedVoiceLibrary.h
+++ b/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedVoiceLibrary.h
@@ -32,68 +32,68 @@ public:
 	//********* Voice Library Functions *************//

 	// Get if a headset is present for the specified local user
-	UFUNCTION(BlueprintPure, Category = "Online|AdvancedVoice|VoiceInfo", meta = (WorldContext = "WorldContextObject"))
-	static void IsHeadsetPresent(UObject* WorldContextObject, bool & bHasHeadset, uint8 LocalPlayerNum = 0);
+	UFUNCTION(BlueprintPure, Category = "Online|AdvancedVoice|VoiceInfo")
+	static void IsHeadsetPresent(bool & bHasHeadset, uint8 LocalPlayerNum = 0);

 	// Starts networked voice, allows push to talk in coordination with StopNetworkedVoice
-	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedVoice", meta = (WorldContext = "WorldContextObject"))
-	static void StartNetworkedVoice(UObject* WorldContextObject, uint8 LocalPlayerNum = 0);
+	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedVoice")
+	static void StartNetworkedVoice(uint8 LocalPlayerNum = 0);

 	// Stops networked voice, allows push to talk in coordination with StartNetworkedVoice
-	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedVoice", meta = (WorldContext = "WorldContextObject"))
-	static void StopNetworkedVoice(UObject* WorldContextObject, uint8 LocalPlayerNum = 0);
+	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedVoice")
+	static void StopNetworkedVoice(uint8 LocalPlayerNum = 0);

 	// Registers a local player as someone interested in voice data
-	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedVoice", meta = (WorldContext = "WorldContextObject"))
-	static bool RegisterLocalTalker(UObject* WorldContextObject, uint8 LocalPlayerNum = 0);
+	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedVoice")
+	static bool RegisterLocalTalker(uint8 LocalPlayerNum = 0);

 	// Registers all signed in players as local talkers
 	// This is already done automatically, only do it manually if you unregistered someone
-	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedVoice", meta = (WorldContext = "WorldContextObject"))
-	static void RegisterAllLocalTalkers(UObject* WorldContextObject);
+	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedVoice")
+	static void RegisterAllLocalTalkers();

 	// UnRegisters local player as a local talker
-	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedVoice", meta = (WorldContext = "WorldContextObject"))
-	static void UnRegisterLocalTalker(UObject* WorldContextObject, uint8 LocalPlayerNum = 0);
+	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedVoice")
+	static void UnRegisterLocalTalker(uint8 LocalPlayerNum = 0);

 	// UnRegisters all signed in players as local talkers
-	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedVoice", meta = (WorldContext = "WorldContextObject"))
-	static void UnRegisterAllLocalTalkers(UObject* WorldContextObject);
+	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedVoice")
+	static void UnRegisterAllLocalTalkers();

 	// Registers a remote player as a talker
 	// This is already done automatically, only do it manually if you unregistered someone
-	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedVoice", meta = (WorldContext = "WorldContextObject"))
-	static bool RegisterRemoteTalker(UObject* WorldContextObject, const FBPUniqueNetId& UniqueNetId);
+	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedVoice")
+	static bool RegisterRemoteTalker(const FBPUniqueNetId& UniqueNetId);

 	// UnRegisters a remote player as a talker
-	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedVoice", meta = (WorldContext = "WorldContextObject"))
-	static bool UnRegisterRemoteTalker(UObject* WorldContextObject, const FBPUniqueNetId& UniqueNetId);
+	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedVoice")
+	static bool UnRegisterRemoteTalker(const FBPUniqueNetId& UniqueNetId);

 	// UnRegisters all remote players as talkers
-	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedVoice", meta = (WorldContext = "WorldContextObject"))
-	static void RemoveAllRemoteTalkers(UObject* WorldContextObject);
+	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedVoice")
+	static void RemoveAllRemoteTalkers();

 	// Returns whether a local player is currently talking
-	UFUNCTION(BlueprintPure, Category = "Online|AdvancedVoice|VoiceInfo", meta = (WorldContext = "WorldContextObject"))
-	static bool IsLocalPlayerTalking(UObject* WorldContextObject, uint8 LocalPlayerNum);
+	UFUNCTION(BlueprintPure, Category = "Online|AdvancedVoice|VoiceInfo")
+	static bool IsLocalPlayerTalking(uint8 LocalPlayerNum);

 	// Returns whether a remote player is currently talking
-	UFUNCTION(BlueprintPure, Category = "Online|AdvancedVoice|VoiceInfo", meta = (WorldContext = "WorldContextObject"))
-	static bool IsRemotePlayerTalking(UObject* WorldContextObject, const FBPUniqueNetId& UniqueNetId);
+	UFUNCTION(BlueprintPure, Category = "Online|AdvancedVoice|VoiceInfo")
+	static bool IsRemotePlayerTalking(const FBPUniqueNetId& UniqueNetId);

 	// Returns whether a player is muted for the specified local player
-	UFUNCTION(BlueprintPure, Category = "Online|AdvancedVoice|VoiceInfo", meta = (WorldContext = "WorldContextObject"))
-	static bool IsPlayerMuted(UObject* WorldContextObject, uint8 LocalUserNumChecking, const FBPUniqueNetId& UniqueNetId);
+	UFUNCTION(BlueprintPure, Category = "Online|AdvancedVoice|VoiceInfo")
+	static bool IsPlayerMuted(uint8 LocalUserNumChecking, const FBPUniqueNetId& UniqueNetId);

 	// Mutes the player associated with the uniquenetid for the specified local player, if IsSystemWide is true then it will attempt to mute globally for the player
-	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedVoice", meta = (WorldContext = "WorldContextObject"))
-	static bool MuteRemoteTalker(UObject* WorldContextObject, uint8 LocalUserNum, const FBPUniqueNetId& UniqueNetId, bool bIsSystemWide = false);
+	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedVoice")
+	static bool MuteRemoteTalker(uint8 LocalUserNum, const FBPUniqueNetId& UniqueNetId, bool bIsSystemWide = false);

 	// UnMutes the player associated with the uniquenetid for the specified local player, if IsSystemWide is true then it will attempt to unmute globally for the player
-	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedVoice", meta = (WorldContext = "WorldContextObject"))
-	static bool UnMuteRemoteTalker(UObject* WorldContextObject, uint8 LocalUserNum, const FBPUniqueNetId& UniqueNetId, bool bIsSystemWide = false);
+	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedVoice")
+	static bool UnMuteRemoteTalker(uint8 LocalUserNum, const FBPUniqueNetId& UniqueNetId, bool bIsSystemWide = false);

 	// Gets the number of local talkers for this system
-	UFUNCTION(BlueprintPure, Category = "Online|AdvancedVoice|VoiceInfo", meta = (WorldContext = "WorldContextObject"))
-	static void GetNumLocalTalkers(UObject* WorldContextObject, int32 & NumLocalTalkers);
+	UFUNCTION(BlueprintPure, Category = "Online|AdvancedVoice|VoiceInfo")
+	static void GetNumLocalTalkers(int32 & NumLocalTalkers);
 };	
--- a/AdvancedSessions/Source/AdvancedSessions/Classes/AutoLoginUserCallbackProxy.h
+++ b/AdvancedSessions/Source/AdvancedSessions/Classes/AutoLoginUserCallbackProxy.h
@@ -51,5 +51,5 @@ private:
 	FDelegateHandle DelegateHandle;

 	// The world context object in which this call is taking place
-	TWeakObjectPtr<UObject> WorldContextObject;
+	UObject* WorldContextObject;
 };
--- a/AdvancedSessions/Source/AdvancedSessions/Classes/BlueprintDataDefinitions.h
+++ b/AdvancedSessions/Source/AdvancedSessions/Classes/BlueprintDataDefinitions.h
@@ -251,17 +251,17 @@ struct FBPFriendPresenceInfo
 public:

 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend")
-		bool bIsOnline = false;
+		bool bIsOnline;
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend")
-		bool bIsPlaying = false;
+		bool bIsPlaying;
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend")
-		bool bIsPlayingThisGame = false;
+		bool bIsPlayingThisGame;
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend")
-		bool bIsJoinable = false;
+		bool bIsJoinable;
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend")
-		bool bHasVoiceSupport = false;
+		bool bHasVoiceSupport;
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend")
-		EBPOnlinePresenceState PresenceState = EBPOnlinePresenceState::Offline;
+		EBPOnlinePresenceState PresenceState;
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend")
 		FString StatusString;

@@ -288,11 +288,11 @@ public:
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend")
 	FString RealName;
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend")
-	EBPOnlinePresenceState OnlineState = EBPOnlinePresenceState::Offline;
+	EBPOnlinePresenceState OnlineState;
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend")
 	FBPUniqueNetId UniqueNetId;
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend")
-	bool bIsPlayingSameGame = false;
+	bool bIsPlayingSameGame;
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend")
 	FBPFriendPresenceInfo PresenceInfo;

--- a/AdvancedSessions/Source/AdvancedSessions/Classes/CancelFindSessionsCallbackProxy.h
+++ b/AdvancedSessions/Source/AdvancedSessions/Classes/CancelFindSessionsCallbackProxy.h
@@ -42,5 +42,5 @@ private:
 	FDelegateHandle DelegateHandle;

 	// The world context object in which this call is taking place
-	TWeakObjectPtr<UObject> WorldContextObject;
+	UObject* WorldContextObject;
 };
--- a/AdvancedSessions/Source/AdvancedSessions/Classes/CreateSessionCallbackProxyAdvanced.h
+++ b/AdvancedSessions/Source/AdvancedSessions/Classes/CreateSessionCallbackProxyAdvanced.h
@@ -27,17 +27,17 @@ class UCreateSessionCallbackProxyAdvanced : public UOnlineBlueprintCallProxyBase
 	 *	  @param bUseLobbiesIfAvailable Used to flag the subsystem to use a lobby api instead of general hosting if the API supports it, generally true on steam for listen servers and false for dedicated
 	 *	  @param bShouldAdvertise	Set to true when the OnlineSubsystem should list your server when someone is searching for servers. Otherwise the server is hidden and only join via invite is possible.
 	 *	  @param bUseLobbiesVoiceChatIfAvailable Set to true to setup voice chat lobbies if the API supports it
-	 * 	  @param bStartAfterCreate Set to true to start the session after it's created. If false you need to manually call StartSession when ready.
+	 *	  @param bStartAfterCreate Set to true to start the session after it's created.
 	 */
 	UFUNCTION(BlueprintCallable, meta=(BlueprintInternalUseOnly = "true", WorldContext="WorldContextObject",AutoCreateRefTerm="ExtraSettings"), Category = "Online|AdvancedSessions")
-		static UCreateSessionCallbackProxyAdvanced* CreateAdvancedSession(UObject* WorldContextObject, const TArray<FSessionPropertyKeyPair>& ExtraSettings, class APlayerController* PlayerController = NULL, int32 PublicConnections = 100, int32 PrivateConnections = 0, bool bUseLAN = false, bool bAllowInvites = true, bool bIsDedicatedServer = false, bool bUsePresence = true, bool bUseLobbiesIfAvailable = true, bool bAllowJoinViaPresence = true, bool bAllowJoinViaPresenceFriendsOnly = false, bool bAntiCheatProtected = false, bool bUsesStats = false, bool bShouldAdvertise = true, bool bUseLobbiesVoiceChatIfAvailable = false, bool bStartAfterCreate = true);
+	static UCreateSessionCallbackProxyAdvanced* CreateAdvancedSession(UObject* WorldContextObject, const TArray<FSessionPropertyKeyPair> &ExtraSettings, class APlayerController* PlayerController = NULL, int32 PublicConnections = 100, int32 PrivateConnections = 0, bool bUseLAN = false, bool bAllowInvites = true, bool bIsDedicatedServer = false, bool bUsePresence = true, bool bUseLobbiesIfAvailable = true, bool bAllowJoinViaPresence = true, bool bAllowJoinViaPresenceFriendsOnly = false, bool bAntiCheatProtected = false, bool bUsesStats = false, bool bShouldAdvertise = true, bool bUseLobbiesVoiceChatIfAvailable = false, bool bStartAfterCreate = true);

 	// UOnlineBlueprintCallProxyBase interface
 	virtual void Activate() override;
 	// End of UOnlineBlueprintCallProxyBase interface

 private:
-	// Internal callback when session creation completes, optionally calls StartSession
+	// Internal callback when session creation completes, calls StartSession
 	void OnCreateCompleted(FName SessionName, bool bWasSuccessful);

 	// Internal callback when session start completes
@@ -102,6 +102,6 @@ private:
 	TArray<FSessionPropertyKeyPair> ExtraSettings;

 	// The world context object in which this call is taking place
-	TWeakObjectPtr<UObject> WorldContextObject;
+	UObject* WorldContextObject;
 };

--- a/AdvancedSessions/Source/AdvancedSessions/Classes/EndSessionCallbackProxy.h
+++ b/AdvancedSessions/Source/AdvancedSessions/Classes/EndSessionCallbackProxy.h
@@ -45,5 +45,5 @@ private:
 	FDelegateHandle DelegateHandle;

 	// The world context object in which this call is taking place
-	TWeakObjectPtr<UObject> WorldContextObject;
+	UObject* WorldContextObject;
 };
--- a/AdvancedSessions/Source/AdvancedSessions/Classes/FindFriendSessionCallbackProxy.h
+++ b/AdvancedSessions/Source/AdvancedSessions/Classes/FindFriendSessionCallbackProxy.h
@@ -46,6 +46,6 @@ private:
 	FDelegateHandle FindFriendSessionCompleteDelegateHandle;

 	// The world context object in which this call is taking place
-	TWeakObjectPtr<UObject> WorldContextObject;
+	UObject* WorldContextObject;
 };

--- a/AdvancedSessions/Source/AdvancedSessions/Classes/FindSessionsCallbackProxyAdvanced.h
+++ b/AdvancedSessions/Source/AdvancedSessions/Classes/FindSessionsCallbackProxyAdvanced.h
@@ -7,7 +7,6 @@
 #include "BlueprintDataDefinitions.h"
 #include "FindSessionsCallbackProxyAdvanced.generated.h"

-
 FORCEINLINE bool operator==(const FBlueprintSessionResult& A, const FBlueprintSessionResult& B)
 {
 	return (A.OnlineResult.IsValid() == B.OnlineResult.IsValid() && (A.OnlineResult.GetSessionIdStr() == B.OnlineResult.GetSessionIdStr()));
@@ -105,5 +104,5 @@ private:
 	int MinSlotsAvailable;

 	// The world context object in which this call is taking place
-	TWeakObjectPtr<UObject> WorldContextObject;
+	UObject* WorldContextObject;
 };
--- a/AdvancedSessions/Source/AdvancedSessions/Classes/GetFriendsCallbackProxy.h
+++ b/AdvancedSessions/Source/AdvancedSessions/Classes/GetFriendsCallbackProxy.h
@@ -44,6 +44,6 @@ private:
 	//EBPFriendsLists FriendListToGet;

 	// The world context object in which this call is taking place
-	TWeakObjectPtr<UObject> WorldContextObject;
+	UObject* WorldContextObject;
 };

--- a/AdvancedSessions/Source/AdvancedSessions/Classes/GetRecentPlayersCallbackProxy.h
+++ b/AdvancedSessions/Source/AdvancedSessions/Classes/GetRecentPlayersCallbackProxy.h
@@ -44,6 +44,6 @@ private:
 	FOnQueryRecentPlayersCompleteDelegate QueryRecentPlayersCompleteDelegate;

 	// The world context object in which this call is taking place
-	TWeakObjectPtr<UObject> WorldContextObject;
+	UObject* WorldContextObject;
 };

--- a/AdvancedSessions/Source/AdvancedSessions/Classes/GetUserPrivilegeCallbackProxy.h
+++ b/AdvancedSessions/Source/AdvancedSessions/Classes/GetUserPrivilegeCallbackProxy.h
@@ -41,5 +41,5 @@ private:
 	EBPUserPrivileges UserPrivilege;

 	// The world context object in which this call is taking place
-	TWeakObjectPtr<UObject> WorldContextObject;
+	UObject* WorldContextObject;
 };
--- a/AdvancedSessions/Source/AdvancedSessions/Classes/LoginUserCallbackProxy.h
+++ b/AdvancedSessions/Source/AdvancedSessions/Classes/LoginUserCallbackProxy.h
@@ -21,8 +21,8 @@ class ULoginUserCallbackProxy : public UOnlineBlueprintCallProxyBase
 	FEmptyOnlineDelegate OnFailure;

 	// Logs into the identity interface
-	UFUNCTION(BlueprintCallable, meta=(BlueprintInternalUseOnly = "true", WorldContext="WorldContextObject", AdvancedDisplay = "AuthType"), Category = "Online|AdvancedIdentity")
-	static ULoginUserCallbackProxy* LoginUser(UObject* WorldContextObject, class APlayerController* PlayerController, FString UserID, FString UserToken, FString AuthType);
+	UFUNCTION(BlueprintCallable, meta = (BlueprintInternalUseOnly = "true", WorldContext = "WorldContextObject", AdvancedDisplay = "AuthType"), Category = "Online|AdvancedIdentity")
+		static ULoginUserCallbackProxy* LoginUser(UObject* WorldContextObject, class APlayerController* PlayerController, FString UserID, FString UserToken, FString AuthType);

 	// UOnlineBlueprintCallProxyBase interface
 	virtual void Activate() override;
@@ -51,5 +51,5 @@ private:
 	FDelegateHandle DelegateHandle;

 	// The world context object in which this call is taking place
-	TWeakObjectPtr<UObject> WorldContextObject;
+	UObject* WorldContextObject;
 };
--- a/AdvancedSessions/Source/AdvancedSessions/Classes/LogoutUserCallbackProxy.h
+++ b/AdvancedSessions/Source/AdvancedSessions/Classes/LogoutUserCallbackProxy.h
@@ -43,5 +43,5 @@ private:
 	FDelegateHandle DelegateHandle;

 	// The world context object in which this call is taking place
-	TWeakObjectPtr<UObject> WorldContextObject;
+	UObject* WorldContextObject;
 };
--- a/AdvancedSessions/Source/AdvancedSessions/Classes/SendFriendInviteCallbackProxy.h
+++ b/AdvancedSessions/Source/AdvancedSessions/Classes/SendFriendInviteCallbackProxy.h
@@ -44,6 +44,6 @@ private:
 	FOnSendInviteComplete OnSendInviteCompleteDelegate;

 	// The world context object in which this call is taking place
-	TWeakObjectPtr<UObject> WorldContextObject;
+	UObject* WorldContextObject;
 };

--- a/AdvancedSessions/Source/AdvancedSessions/Classes/StartSessionCallbackProxyAdvanced.h
+++ b/AdvancedSessions/Source/AdvancedSessions/Classes/StartSessionCallbackProxyAdvanced.h
@@ -25,7 +25,7 @@ class UStartSessionCallbackProxyAdvanced : public UOnlineBlueprintCallProxyBase
 		, meta=(BlueprintInternalUseOnly = "true", WorldContext="WorldContextObject")
 		, Category = "Online|AdvancedSessions"
 	)
-	static UStartSessionCallbackProxyAdvanced* StartAdvancedSession(UObject* WorldContextObject);
+	static UStartSessionCallbackProxyAdvanced* StartAdvancedSession(const UObject* WorldContextObject);

 	// UOnlineBlueprintCallProxyBase interface
 	virtual void Activate() override;
@@ -42,5 +42,5 @@ private:
 	FDelegateHandle StartCompleteDelegateHandle;

 	// The world context object in which this call is taking place
-	TWeakObjectPtr<UObject> WorldContextObject;
+	const UObject* WorldContextObject;
 };
--- a/AdvancedSessions/Source/AdvancedSessions/Classes/UpdateSessionCallbackProxyAdvanced.h
+++ b/AdvancedSessions/Source/AdvancedSessions/Classes/UpdateSessionCallbackProxyAdvanced.h
@@ -64,6 +64,6 @@ private:
 	bool bShouldAdvertise = true;

 	// The world context object in which this call is taking place
-	TWeakObjectPtr<UObject> WorldContextObject;
+	UObject* WorldContextObject;
 };

--- a/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedExternalUILibrary.cpp
+++ b/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedExternalUILibrary.cpp
@@ -6,17 +6,9 @@
 //General Log
 DEFINE_LOG_CATEGORY(AdvancedExternalUILog);

-void UAdvancedExternalUILibrary::ShowAccountUpgradeUI(UObject* WorldContextObject, const FBPUniqueNetId PlayerRequestingAccountUpgradeUI, EBlueprintResultSwitch &Result)
+void UAdvancedExternalUILibrary::ShowAccountUpgradeUI(const FBPUniqueNetId PlayerRequestingAccountUpgradeUI, EBlueprintResultSwitch &Result)
 {
-
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	IOnlineExternalUIPtr ExternalUIInterface = Online::GetExternalUIInterface(World);
+	IOnlineExternalUIPtr ExternalUIInterface = Online::GetExternalUIInterface();

 	if (!ExternalUIInterface.IsValid())
 	{
@@ -29,17 +21,10 @@ void UAdvancedExternalUILibrary::ShowAccountUpgradeUI(UObject* WorldContextObjec
 	Result = EBlueprintResultSwitch::OnSuccess;
 }

-void UAdvancedExternalUILibrary::ShowProfileUI(UObject* WorldContextObject, const FBPUniqueNetId PlayerViewingProfile, const FBPUniqueNetId PlayerToViewProfileOf, EBlueprintResultSwitch &Result)
+void UAdvancedExternalUILibrary::ShowProfileUI(const FBPUniqueNetId PlayerViewingProfile, const FBPUniqueNetId PlayerToViewProfileOf, EBlueprintResultSwitch &Result)
 {

-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	IOnlineExternalUIPtr ExternalUIInterface = Online::GetExternalUIInterface(World);
+	IOnlineExternalUIPtr ExternalUIInterface = Online::GetExternalUIInterface();

 	if (!ExternalUIInterface.IsValid())
 	{
@@ -54,16 +39,9 @@ void UAdvancedExternalUILibrary::ShowProfileUI(UObject* WorldContextObject, cons



-void UAdvancedExternalUILibrary::ShowWebURLUI(UObject* WorldContextObject, FString URLToShow, EBlueprintResultSwitch &Result, TArray<FString>& AllowedDomains, bool bEmbedded, bool bShowBackground, bool bShowCloseButton, int32 OffsetX, int32 OffsetY, int32 SizeX, int32 SizeY)
+void UAdvancedExternalUILibrary::ShowWebURLUI(FString URLToShow, EBlueprintResultSwitch &Result, TArray<FString>& AllowedDomains, bool bEmbedded, bool bShowBackground, bool bShowCloseButton, int32 OffsetX, int32 OffsetY, int32 SizeX, int32 SizeY)
 {
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	IOnlineExternalUIPtr ExternalUIInterface = Online::GetExternalUIInterface(World);
+	IOnlineExternalUIPtr ExternalUIInterface = Online::GetExternalUIInterface();

 	if (!ExternalUIInterface.IsValid())
 	{
@@ -89,15 +67,9 @@ void UAdvancedExternalUILibrary::ShowWebURLUI(UObject* WorldContextObject, FStri
 	Result = EBlueprintResultSwitch::OnSuccess;
 }

-void UAdvancedExternalUILibrary::CloseWebURLUI(UObject* WorldContextObject)
+void UAdvancedExternalUILibrary::CloseWebURLUI()
 {
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		return;
-	}
-
-	IOnlineExternalUIPtr ExternalUIInterface = Online::GetExternalUIInterface(World);
+	IOnlineExternalUIPtr ExternalUIInterface = Online::GetExternalUIInterface();

 	if (!ExternalUIInterface.IsValid())
 	{
@@ -108,16 +80,9 @@ void UAdvancedExternalUILibrary::CloseWebURLUI(UObject* WorldContextObject)
 	ExternalUIInterface->CloseWebURL();
 }

-void UAdvancedExternalUILibrary::ShowLeaderBoardUI(UObject* WorldContextObject, FString LeaderboardName, EBlueprintResultSwitch &Result)
+void UAdvancedExternalUILibrary::ShowLeaderBoardUI(FString LeaderboardName, EBlueprintResultSwitch &Result)
 {
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	IOnlineExternalUIPtr ExternalUIInterface = Online::GetExternalUIInterface(World);
+	IOnlineExternalUIPtr ExternalUIInterface = Online::GetExternalUIInterface();

 	if (!ExternalUIInterface.IsValid())
 	{
@@ -132,7 +97,7 @@ void UAdvancedExternalUILibrary::ShowLeaderBoardUI(UObject* WorldContextObject,
 }


-void UAdvancedExternalUILibrary::ShowInviteUI(UObject* WorldContextObject, APlayerController *PlayerController, EBlueprintResultSwitch &Result)
+void UAdvancedExternalUILibrary::ShowInviteUI(APlayerController *PlayerController, EBlueprintResultSwitch &Result)
 {
 	if (!PlayerController)
 	{
@@ -141,14 +106,7 @@ void UAdvancedExternalUILibrary::ShowInviteUI(UObject* WorldContextObject, APlay
 		return;
 	}

-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	IOnlineExternalUIPtr ExternalUIInterface = Online::GetExternalUIInterface(World);
+	IOnlineExternalUIPtr ExternalUIInterface = Online::GetExternalUIInterface();

 	if (!ExternalUIInterface.IsValid())
 	{
@@ -170,7 +128,7 @@ void UAdvancedExternalUILibrary::ShowInviteUI(UObject* WorldContextObject, APlay
 	Result = EBlueprintResultSwitch::OnSuccess;
 }

-void UAdvancedExternalUILibrary::ShowFriendsUI(UObject* WorldContextObject, APlayerController *PlayerController, EBlueprintResultSwitch &Result)
+void UAdvancedExternalUILibrary::ShowFriendsUI(APlayerController *PlayerController, EBlueprintResultSwitch &Result)
 {
 	if (!PlayerController)
 	{
@@ -179,14 +137,7 @@ void UAdvancedExternalUILibrary::ShowFriendsUI(UObject* WorldContextObject, APla
 		return;
 	}

-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	IOnlineExternalUIPtr ExternalUIInterface = Online::GetExternalUIInterface(World);
+	IOnlineExternalUIPtr ExternalUIInterface = Online::GetExternalUIInterface();

 	if (!ExternalUIInterface.IsValid())
 	{
--- a/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedIdentityLibrary.cpp
+++ b/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedIdentityLibrary.cpp
@@ -5,7 +5,7 @@
 DEFINE_LOG_CATEGORY(AdvancedIdentityLog);


-void UAdvancedIdentityLibrary::GetPlayerAuthToken(UObject* WorldContextObject, APlayerController * PlayerController, FString & AuthToken, EBlueprintResultSwitch &Result)
+void UAdvancedIdentityLibrary::GetPlayerAuthToken(APlayerController * PlayerController, FString & AuthToken, EBlueprintResultSwitch &Result)
 {
 	if (!PlayerController)
 	{
@@ -23,14 +23,7 @@ void UAdvancedIdentityLibrary::GetPlayerAuthToken(UObject* WorldContextObject, A
 		return;
 	}

-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	IOnlineIdentityPtr IdentityInterface = Online::GetIdentityInterface(World);
+	IOnlineIdentityPtr IdentityInterface = Online::GetIdentityInterface();

 	if (!IdentityInterface.IsValid())
 	{
@@ -43,7 +36,7 @@ void UAdvancedIdentityLibrary::GetPlayerAuthToken(UObject* WorldContextObject, A
 	Result = EBlueprintResultSwitch::OnSuccess;
 }

-void UAdvancedIdentityLibrary::GetPlayerNickname(UObject* WorldContextObject, const FBPUniqueNetId & UniqueNetID, FString & PlayerNickname)
+void UAdvancedIdentityLibrary::GetPlayerNickname(const FBPUniqueNetId & UniqueNetID, FString & PlayerNickname)
 {
 	if (!UniqueNetID.IsValid())
 	{
@@ -51,13 +44,7 @@ void UAdvancedIdentityLibrary::GetPlayerNickname(UObject* WorldContextObject, co
 		return;
 	}

-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		return;
-	}
-
-	IOnlineIdentityPtr IdentityInterface = Online::GetIdentityInterface(World);
+	IOnlineIdentityPtr IdentityInterface = Online::GetIdentityInterface();

 	if (!IdentityInterface.IsValid())
 	{
@@ -68,7 +55,7 @@ void UAdvancedIdentityLibrary::GetPlayerNickname(UObject* WorldContextObject, co
 }


-void UAdvancedIdentityLibrary::GetLoginStatus(UObject* WorldContextObject, const FBPUniqueNetId & UniqueNetID, EBPLoginStatus & LoginStatus, EBlueprintResultSwitch &Result)
+void UAdvancedIdentityLibrary::GetLoginStatus(const FBPUniqueNetId & UniqueNetID, EBPLoginStatus & LoginStatus, EBlueprintResultSwitch &Result)
 {
 	if (!UniqueNetID.IsValid())
 	{
@@ -77,14 +64,7 @@ void UAdvancedIdentityLibrary::GetLoginStatus(UObject* WorldContextObject, const
 		return;
 	}

-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	IOnlineIdentityPtr IdentityInterface = Online::GetIdentityInterface(World);
+	IOnlineIdentityPtr IdentityInterface = Online::GetIdentityInterface();

 	if (!IdentityInterface.IsValid())
 	{
@@ -98,17 +78,9 @@ void UAdvancedIdentityLibrary::GetLoginStatus(UObject* WorldContextObject, const
 }


-void UAdvancedIdentityLibrary::GetAllUserAccounts(UObject* WorldContextObject, TArray<FBPUserOnlineAccount> & AccountInfos, EBlueprintResultSwitch &Result)
+void UAdvancedIdentityLibrary::GetAllUserAccounts(TArray<FBPUserOnlineAccount> & AccountInfos, EBlueprintResultSwitch &Result)
 {
-
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	IOnlineIdentityPtr IdentityInterface = Online::GetIdentityInterface(World);
+	IOnlineIdentityPtr IdentityInterface = Online::GetIdentityInterface();

 	if (!IdentityInterface.IsValid())
 	{
@@ -127,17 +99,9 @@ void UAdvancedIdentityLibrary::GetAllUserAccounts(UObject* WorldContextObject, T
 	Result = EBlueprintResultSwitch::OnSuccess;
 }

-void UAdvancedIdentityLibrary::GetUserAccount(UObject* WorldContextObject, const FBPUniqueNetId & UniqueNetId, FBPUserOnlineAccount & AccountInfo, EBlueprintResultSwitch &Result)
+void UAdvancedIdentityLibrary::GetUserAccount(const FBPUniqueNetId & UniqueNetId, FBPUserOnlineAccount & AccountInfo, EBlueprintResultSwitch &Result)
 {
-
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	IOnlineIdentityPtr IdentityInterface = Online::GetIdentityInterface(World);
+	IOnlineIdentityPtr IdentityInterface = Online::GetIdentityInterface();

 	if(!UniqueNetId.IsValid())
 	{
--- a/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedSessionsLibrary.cpp
+++ b/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedSessionsLibrary.cpp
@@ -451,6 +451,17 @@ void UAdvancedSessionsLibrary::GetUniqueNetID(APlayerController *PlayerControlle
 	}
 }

+void UAdvancedSessionsLibrary::GetUniqueNetIdOfSessionOwner(FBlueprintSessionResult SessionResult, FBPUniqueNetId& UniqueNetId)
+{
+	FBPUniqueNetId ReturnID;
+	if (SessionResult.OnlineResult.IsValid())
+	{
+		ReturnID.SetUniqueNetId(SessionResult.OnlineResult.Session.OwningUserId);
+	}
+
+	UniqueNetId = ReturnID;
+}
+
 void UAdvancedSessionsLibrary::GetUniqueNetIDFromPlayerState(APlayerState *PlayerState, FBPUniqueNetId &UniqueNetId)
 {
 	if (!PlayerState)
@@ -477,11 +488,6 @@ bool UAdvancedSessionsLibrary::EqualEqual_UNetIDUnetID(const FBPUniqueNetId &A,
 	return ((A.IsValid() && B.IsValid()) && (*A.GetUniqueNetId() == *B.GetUniqueNetId()));
 }

-FUniqueNetIdRepl UAdvancedSessionsLibrary::Conv_BPUniqueIDToUniqueNetIDRepl(const FBPUniqueNetId& InUniqueID)
-{
-	return FUniqueNetIdRepl(InUniqueID.GetUniqueNetId()->AsShared());
-}
-
 void UAdvancedSessionsLibrary::SetPlayerName(APlayerController *PlayerController, FString PlayerName)
 {
 	if (!PlayerController)
@@ -536,17 +542,11 @@ void UAdvancedSessionsLibrary::GetNumberOfNetworkPlayers(UObject* WorldContextOb

 bool UAdvancedSessionsLibrary::ServerTravel(UObject* WorldContextObject, const FString& FURL, bool bAbsolute, bool bShouldSkipGameNotify)
 {
-	if (!WorldContextObject)
-	{
-		return false;
-	}
+	if (!WorldContextObject) return false;

 	//using a context object to get the world
 	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::ReturnNull);
-	if (World)
-	{
-		return World->ServerTravel(FURL, bAbsolute, bShouldSkipGameNotify);
-	}
-
-	return false;
+	if (!World) return false;
+	World->ServerTravel(FURL,bAbsolute,bShouldSkipGameNotify);
+	return true;
 }
--- a/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedVoiceLibrary.cpp
+++ b/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedVoiceLibrary.cpp
@@ -5,16 +5,9 @@
 //General Log
 DEFINE_LOG_CATEGORY(AdvancedVoiceLog);

-void UAdvancedVoiceLibrary::IsHeadsetPresent(UObject* WorldContextObject, bool & bHasHeadset, uint8 LocalPlayerNum)
+void UAdvancedVoiceLibrary::IsHeadsetPresent(bool & bHasHeadset, uint8 LocalPlayerNum)
 {
-
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		return;
-	}
-
-	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface(World);
+	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface();

 	if (!VoiceInterface.IsValid())
 	{
@@ -26,16 +19,9 @@ void UAdvancedVoiceLibrary::IsHeadsetPresent(UObject* WorldContextObject, bool &
 	bHasHeadset = VoiceInterface->IsHeadsetPresent(LocalPlayerNum);
 }

-void UAdvancedVoiceLibrary::StartNetworkedVoice(UObject* WorldContextObject, uint8 LocalPlayerNum)
+void UAdvancedVoiceLibrary::StartNetworkedVoice(uint8 LocalPlayerNum)
 {
-
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		return;
-	}
-
-	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface(World);
+	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface();

 	if (!VoiceInterface.IsValid())
 	{
@@ -46,16 +32,9 @@ void UAdvancedVoiceLibrary::StartNetworkedVoice(UObject* WorldContextObject, uin
 	VoiceInterface->StartNetworkedVoice(LocalPlayerNum);
 }

-void UAdvancedVoiceLibrary::StopNetworkedVoice(UObject* WorldContextObject, uint8 LocalPlayerNum)
+void UAdvancedVoiceLibrary::StopNetworkedVoice(uint8 LocalPlayerNum)
 {
-
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		return;
-	}
-
-	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface(World);
+	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface();

 	if (!VoiceInterface.IsValid())
 	{
@@ -66,15 +45,9 @@ void UAdvancedVoiceLibrary::StopNetworkedVoice(UObject* WorldContextObject, uint
 	VoiceInterface->StopNetworkedVoice(LocalPlayerNum);
 }

-bool UAdvancedVoiceLibrary::RegisterLocalTalker(UObject* WorldContextObject, uint8 LocalPlayerNum)
+bool UAdvancedVoiceLibrary::RegisterLocalTalker(uint8 LocalPlayerNum)
 {
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		return false;
-	}
-
-	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface(World);
+	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface();

 	if (!VoiceInterface.IsValid())
 	{
@@ -85,16 +58,9 @@ bool UAdvancedVoiceLibrary::RegisterLocalTalker(UObject* WorldContextObject, uin
 	return VoiceInterface->RegisterLocalTalker(LocalPlayerNum);
 }

-void UAdvancedVoiceLibrary::RegisterAllLocalTalkers(UObject* WorldContextObject)
+void UAdvancedVoiceLibrary::RegisterAllLocalTalkers()
 {
-
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		return;
-	}
-
-	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface(World);
+	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface();

 	if (!VoiceInterface.IsValid())
 	{
@@ -106,16 +72,9 @@ void UAdvancedVoiceLibrary::RegisterAllLocalTalkers(UObject* WorldContextObject)
 }


-void UAdvancedVoiceLibrary::UnRegisterLocalTalker(UObject* WorldContextObject, uint8 LocalPlayerNum)
+void UAdvancedVoiceLibrary::UnRegisterLocalTalker(uint8 LocalPlayerNum)
 {
-
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		return;
-	}
-
-	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface(World);
+	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface();

 	if (!VoiceInterface.IsValid())
 	{
@@ -126,16 +85,9 @@ void UAdvancedVoiceLibrary::UnRegisterLocalTalker(UObject* WorldContextObject, u
 	VoiceInterface->UnregisterLocalTalker(LocalPlayerNum);
 }

-void UAdvancedVoiceLibrary::UnRegisterAllLocalTalkers(UObject* WorldContextObject)
+void UAdvancedVoiceLibrary::UnRegisterAllLocalTalkers()
 {
-
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		return;
-	}
-
-	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface(World);
+	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface();

 	if (!VoiceInterface.IsValid())
 	{
@@ -146,7 +98,7 @@ void UAdvancedVoiceLibrary::UnRegisterAllLocalTalkers(UObject* WorldContextObjec
 	VoiceInterface->UnregisterLocalTalkers();
 }

-bool UAdvancedVoiceLibrary::RegisterRemoteTalker(UObject* WorldContextObject, const FBPUniqueNetId& UniqueNetId)
+bool UAdvancedVoiceLibrary::RegisterRemoteTalker(const FBPUniqueNetId& UniqueNetId)
 {
 	if (!UniqueNetId.IsValid())
 	{
@@ -154,13 +106,7 @@ bool UAdvancedVoiceLibrary::RegisterRemoteTalker(UObject* WorldContextObject, co
 		return false;
 	}

-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		return false;
-	}
-
-	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface(World);
+	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface();

 	if (!VoiceInterface.IsValid())
 	{
@@ -171,7 +117,7 @@ bool UAdvancedVoiceLibrary::RegisterRemoteTalker(UObject* WorldContextObject, co
 	return VoiceInterface->RegisterRemoteTalker(*UniqueNetId.GetUniqueNetId());
 }

-bool UAdvancedVoiceLibrary::UnRegisterRemoteTalker(UObject* WorldContextObject, const FBPUniqueNetId& UniqueNetId)
+bool UAdvancedVoiceLibrary::UnRegisterRemoteTalker(const FBPUniqueNetId& UniqueNetId)
 {
 	if (!UniqueNetId.IsValid())
 	{
@@ -179,13 +125,7 @@ bool UAdvancedVoiceLibrary::UnRegisterRemoteTalker(UObject* WorldContextObject,
 		return false;
 	}

-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		return false;
-	}
-
-	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface(World);
+	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface();

 	if (!VoiceInterface.IsValid())
 	{
@@ -196,16 +136,9 @@ bool UAdvancedVoiceLibrary::UnRegisterRemoteTalker(UObject* WorldContextObject,
 	return VoiceInterface->UnregisterRemoteTalker(*UniqueNetId.GetUniqueNetId());
 }

-void UAdvancedVoiceLibrary::RemoveAllRemoteTalkers(UObject* WorldContextObject)
+void UAdvancedVoiceLibrary::RemoveAllRemoteTalkers()
 {
-
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		return;
-	}
-
-	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface(World);
+	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface();

 	if (!VoiceInterface.IsValid())
 	{
@@ -216,16 +149,9 @@ void UAdvancedVoiceLibrary::RemoveAllRemoteTalkers(UObject* WorldContextObject)
 	VoiceInterface->RemoveAllRemoteTalkers();
 }

-bool UAdvancedVoiceLibrary::IsLocalPlayerTalking(UObject* WorldContextObject, uint8 LocalPlayerNum)
+bool UAdvancedVoiceLibrary::IsLocalPlayerTalking(uint8 LocalPlayerNum)
 {
-
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		return false;
-	}
-
-	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface(World);
+	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface();

 	if (!VoiceInterface.IsValid())
 	{
@@ -236,7 +162,7 @@ bool UAdvancedVoiceLibrary::IsLocalPlayerTalking(UObject* WorldContextObject, ui
 	return VoiceInterface->IsLocalPlayerTalking(LocalPlayerNum);
 }

-bool UAdvancedVoiceLibrary::IsRemotePlayerTalking(UObject* WorldContextObject, const FBPUniqueNetId& UniqueNetId)
+bool UAdvancedVoiceLibrary::IsRemotePlayerTalking(const FBPUniqueNetId& UniqueNetId)
 {
 	if (!UniqueNetId.IsValid())
 	{
@@ -244,13 +170,7 @@ bool UAdvancedVoiceLibrary::IsRemotePlayerTalking(UObject* WorldContextObject, c
 		return false;
 	}

-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		return false;
-	}
-
-	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface(World);
+	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface();

 	if (!VoiceInterface.IsValid())
 	{
@@ -261,7 +181,7 @@ bool UAdvancedVoiceLibrary::IsRemotePlayerTalking(UObject* WorldContextObject, c
 	return VoiceInterface->IsRemotePlayerTalking(*UniqueNetId.GetUniqueNetId());
 }

-bool UAdvancedVoiceLibrary::IsPlayerMuted(UObject* WorldContextObject, uint8 LocalUserNumChecking, const FBPUniqueNetId& UniqueNetId)
+bool UAdvancedVoiceLibrary::IsPlayerMuted(uint8 LocalUserNumChecking, const FBPUniqueNetId& UniqueNetId)
 {
 	if (!UniqueNetId.IsValid())
 	{
@@ -269,13 +189,7 @@ bool UAdvancedVoiceLibrary::IsPlayerMuted(UObject* WorldContextObject, uint8 Loc
 		return false;
 	}

-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		return false;
-	}
-
-	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface(World);
+	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface();

 	if (!VoiceInterface.IsValid())
 	{
@@ -286,7 +200,7 @@ bool UAdvancedVoiceLibrary::IsPlayerMuted(UObject* WorldContextObject, uint8 Loc
 	return VoiceInterface->IsMuted(LocalUserNumChecking, *UniqueNetId.GetUniqueNetId());
 }

-bool UAdvancedVoiceLibrary::MuteRemoteTalker(UObject* WorldContextObject, uint8 LocalUserNum, const FBPUniqueNetId& UniqueNetId, bool bIsSystemWide)
+bool UAdvancedVoiceLibrary::MuteRemoteTalker(uint8 LocalUserNum, const FBPUniqueNetId& UniqueNetId, bool bIsSystemWide)
 {
 	if (!UniqueNetId.IsValid())
 	{
@@ -294,13 +208,7 @@ bool UAdvancedVoiceLibrary::MuteRemoteTalker(UObject* WorldContextObject, uint8
 		return false;
 	}

-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		return false;
-	}
-
-	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface(World);
+	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface();

 	if (!VoiceInterface.IsValid())
 	{
@@ -311,7 +219,7 @@ bool UAdvancedVoiceLibrary::MuteRemoteTalker(UObject* WorldContextObject, uint8
 	return VoiceInterface->MuteRemoteTalker(LocalUserNum, *UniqueNetId.GetUniqueNetId(), bIsSystemWide);
 }

-bool UAdvancedVoiceLibrary::UnMuteRemoteTalker(UObject* WorldContextObject, uint8 LocalUserNum, const FBPUniqueNetId& UniqueNetId, bool bIsSystemWide)
+bool UAdvancedVoiceLibrary::UnMuteRemoteTalker(uint8 LocalUserNum, const FBPUniqueNetId& UniqueNetId, bool bIsSystemWide)
 {
 	if (!UniqueNetId.IsValid())
 	{
@@ -319,13 +227,7 @@ bool UAdvancedVoiceLibrary::UnMuteRemoteTalker(UObject* WorldContextObject, uint
 		return false;
 	}

-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		return false;
-	}
-
-	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface(World);
+	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface();

 	if (!VoiceInterface.IsValid())
 	{
@@ -337,16 +239,9 @@ bool UAdvancedVoiceLibrary::UnMuteRemoteTalker(UObject* WorldContextObject, uint
 }


-void UAdvancedVoiceLibrary::GetNumLocalTalkers(UObject* WorldContextObject, int32 & NumLocalTalkers)
+void UAdvancedVoiceLibrary::GetNumLocalTalkers(int32 & NumLocalTalkers)
 {
-
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		return;
-	}
-
-	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface(World);
+	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface();

 	if (!VoiceInterface.IsValid())
 	{
--- a/AdvancedSessions/Source/AdvancedSessions/Private/AutoLoginUserCallbackProxy.cpp
+++ b/AdvancedSessions/Source/AdvancedSessions/Private/AutoLoginUserCallbackProxy.cpp
@@ -3,8 +3,6 @@
 #include "AutoLoginUserCallbackProxy.h"
 #include "Kismet/GameplayStatics.h"

-#include "Online.h"
-
 //////////////////////////////////////////////////////////////////////////
 // ULoginUserCallbackProxy

@@ -24,19 +22,13 @@ UAutoLoginUserCallbackProxy* UAutoLoginUserCallbackProxy::AutoLoginUser(UObject*

 void UAutoLoginUserCallbackProxy::Activate()
 {
+	auto Identity = Online::GetIdentityInterface();

-	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("AutoLoginUser"), GEngine->GetWorldFromContextObject(WorldContextObject.Get(), EGetWorldErrorMode::LogAndReturnNull));
-	
-	if (Helper.OnlineSub != nullptr)
+	if (Identity.IsValid())
 	{
-		auto Identity = Helper.OnlineSub->GetIdentityInterface();
-
-		if (Identity.IsValid())
-		{
-			DelegateHandle = Identity->AddOnLoginCompleteDelegate_Handle(LocalUserNumber, Delegate);
-			Identity->AutoLogin(LocalUserNumber);
-			return;
-		}
+		DelegateHandle = Identity->AddOnLoginCompleteDelegate_Handle(LocalUserNumber, Delegate);
+		Identity->AutoLogin(LocalUserNumber);
+		return;
 	}

 	// Fail immediately
@@ -45,45 +37,39 @@ void UAutoLoginUserCallbackProxy::Activate()

 void UAutoLoginUserCallbackProxy::OnCompleted(int32 LocalUserNum, bool bWasSuccessful, const FUniqueNetId& UserId, const FString& ErrorVal)
 {
-	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("AutoLoginUser"), GEngine->GetWorldFromContextObject(WorldContextObject.Get(), EGetWorldErrorMode::LogAndReturnNull));
+	auto Identity = Online::GetIdentityInterface();

-	if (Helper.OnlineSub != nullptr)
+	if (Identity.IsValid())
 	{
-		auto Identity = Helper.OnlineSub->GetIdentityInterface();
+		Identity->ClearOnLoginCompleteDelegate_Handle(LocalUserNum, DelegateHandle);
+	}

-		if (Identity.IsValid())
+
+	if(APlayerController* PController = UGameplayStatics::GetPlayerController(WorldContextObject->GetWorld(), LocalUserNum))
+	{
+		ULocalPlayer* Player = Cast<ULocalPlayer>(PController->Player);
+
+		auto uniqueId = UserId.AsShared();
+
+		if (Player)
 		{
-			Identity->ClearOnLoginCompleteDelegate_Handle(LocalUserNum, DelegateHandle);
+			Player->SetCachedUniqueNetId(uniqueId);
 		}

-		if (APlayerController* PController = UGameplayStatics::GetPlayerController(WorldContextObject->GetWorld(), LocalUserNum))
+		if (APlayerState* State = PController->PlayerState)
 		{
-			ULocalPlayer* Player = Cast<ULocalPlayer>(PController->Player);
-
-			FUniqueNetIdRepl uniqueId(UserId.AsShared());
-
-			if (Player)
-			{
-				Player->SetCachedUniqueNetId(uniqueId);
-			}
-
-			if (APlayerState* State = PController->PlayerState)
-			{
-				// Update UniqueId. See also ShowLoginUICallbackProxy.cpp
-				State->SetUniqueId(uniqueId);
-			}
-		}
-
-
-		if (bWasSuccessful)
-		{
-			OnSuccess.Broadcast();
-		}
-		else
-		{
-			OnFailure.Broadcast();
+			// Update UniqueId. See also ShowLoginUICallbackProxy.cpp
+			State->SetUniqueId((const FUniqueNetIdPtr&)uniqueId);
 		}
 	}

-	OnFailure.Broadcast();
+
+	if (bWasSuccessful)
+	{
+		OnSuccess.Broadcast();
+	}
+	else
+	{
+		OnFailure.Broadcast();
+	}
 }
--- a/AdvancedSessions/Source/AdvancedSessions/Private/CancelFindSessionsCallbackProxy.cpp
+++ b/AdvancedSessions/Source/AdvancedSessions/Private/CancelFindSessionsCallbackProxy.cpp
@@ -21,7 +21,7 @@ UCancelFindSessionsCallbackProxy* UCancelFindSessionsCallbackProxy::CancelFindSe

 void UCancelFindSessionsCallbackProxy::Activate()
 {
-	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("CancelFindSessions"), GEngine->GetWorldFromContextObject(WorldContextObject.Get(), EGetWorldErrorMode::LogAndReturnNull));
+	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("CancelFindSessions"), GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull));
 	Helper.QueryIDFromPlayerController(PlayerControllerWeakPtr.Get());

 	if (Helper.IsValid())
@@ -47,7 +47,7 @@ void UCancelFindSessionsCallbackProxy::Activate()

 void UCancelFindSessionsCallbackProxy::OnCompleted(bool bWasSuccessful)
 {
-	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("CancelFindSessionsCallback"), GEngine->GetWorldFromContextObject(WorldContextObject.Get(), EGetWorldErrorMode::LogAndReturnNull));
+	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("CancelFindSessionsCallback"), GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull));
 	Helper.QueryIDFromPlayerController(PlayerControllerWeakPtr.Get());

 	if (Helper.IsValid())
--- a/AdvancedSessions/Source/AdvancedSessions/Private/CreateSessionCallbackProxyAdvanced.cpp
+++ b/AdvancedSessions/Source/AdvancedSessions/Private/CreateSessionCallbackProxyAdvanced.cpp
@@ -13,7 +13,7 @@ UCreateSessionCallbackProxyAdvanced::UCreateSessionCallbackProxyAdvanced(const F
 {
 }

-UCreateSessionCallbackProxyAdvanced* UCreateSessionCallbackProxyAdvanced::CreateAdvancedSession(UObject* WorldContextObject, const TArray<FSessionPropertyKeyPair>& ExtraSettings, class APlayerController* PlayerController, int32 PublicConnections, int32 PrivateConnections, bool bUseLAN, bool bAllowInvites, bool bIsDedicatedServer, bool bUsePresence, bool bUseLobbiesIfAvailable, bool bAllowJoinViaPresence, bool bAllowJoinViaPresenceFriendsOnly, bool bAntiCheatProtected, bool bUsesStats, bool bShouldAdvertise, bool bUseLobbiesVoiceChatIfAvailable, bool bStartAfterCreate)
+UCreateSessionCallbackProxyAdvanced* UCreateSessionCallbackProxyAdvanced::CreateAdvancedSession(UObject* WorldContextObject, const TArray<FSessionPropertyKeyPair> &ExtraSettings, class APlayerController* PlayerController, int32 PublicConnections, int32 PrivateConnections, bool bUseLAN, bool bAllowInvites, bool bIsDedicatedServer, bool bUsePresence, bool bUseLobbiesIfAvailable, bool bAllowJoinViaPresence, bool bAllowJoinViaPresenceFriendsOnly, bool bAntiCheatProtected, bool bUsesStats, bool bShouldAdvertise, bool bUseLobbiesVoiceChatIfAvailable, bool bStartAfterCreate)
 {
 	UCreateSessionCallbackProxyAdvanced* Proxy = NewObject<UCreateSessionCallbackProxyAdvanced>();
 	Proxy->PlayerControllerWeakPtr = PlayerController;
@@ -38,7 +38,7 @@ UCreateSessionCallbackProxyAdvanced* UCreateSessionCallbackProxyAdvanced::Create

 void UCreateSessionCallbackProxyAdvanced::Activate()
 {
-	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("CreateSession"), GEngine->GetWorldFromContextObject(WorldContextObject.Get(), EGetWorldErrorMode::LogAndReturnNull));
+	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("CreateSession"), GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull));
 	
 	if (PlayerControllerWeakPtr.IsValid() )
 		Helper.QueryIDFromPlayerController(PlayerControllerWeakPtr.Get());
@@ -121,7 +121,7 @@ void UCreateSessionCallbackProxyAdvanced::Activate()

 void UCreateSessionCallbackProxyAdvanced::OnCreateCompleted(FName SessionName, bool bWasSuccessful)
 {
-	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("CreateSessionCallback"), GEngine->GetWorldFromContextObject(WorldContextObject.Get(), EGetWorldErrorMode::LogAndReturnNull));
+	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("CreateSessionCallback"), GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull));
 	//Helper.QueryIDFromPlayerController(PlayerControllerWeakPtr.Get());

 	if (Helper.OnlineSub != nullptr)
@@ -133,7 +133,7 @@ void UCreateSessionCallbackProxyAdvanced::OnCreateCompleted(FName SessionName, b
 			
 			if (bWasSuccessful)
 			{
-				if (this->bStartAfterCreate)
+				if(this->bStartAfterCreate)
 				{
 					UE_LOG_ONLINE_SESSION(Display, TEXT("Session creation completed. Automatic start is turned on, starting session now."));
 					StartCompleteDelegateHandle = Sessions->AddOnStartSessionCompleteDelegate_Handle(StartCompleteDelegate);
@@ -159,7 +159,7 @@ void UCreateSessionCallbackProxyAdvanced::OnCreateCompleted(FName SessionName, b

 void UCreateSessionCallbackProxyAdvanced::OnStartCompleted(FName SessionName, bool bWasSuccessful)
 {
-	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("StartSessionCallback"), GEngine->GetWorldFromContextObject(WorldContextObject.Get(), EGetWorldErrorMode::LogAndReturnNull));
+	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("StartSessionCallback"), GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull));
 	//Helper.QueryIDFromPlayerController(PlayerControllerWeakPtr.Get());

 	if (Helper.OnlineSub != nullptr)
--- a/AdvancedSessions/Source/AdvancedSessions/Private/EndSessionCallbackProxy.cpp
+++ b/AdvancedSessions/Source/AdvancedSessions/Private/EndSessionCallbackProxy.cpp
@@ -21,7 +21,7 @@ UEndSessionCallbackProxy* UEndSessionCallbackProxy::EndSession(UObject* WorldCon

 void UEndSessionCallbackProxy::Activate()
 {
-	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("EndSession"), GEngine->GetWorldFromContextObject(WorldContextObject.Get(), EGetWorldErrorMode::LogAndReturnNull));
+	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("EndSession"), GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull));
 	Helper.QueryIDFromPlayerController(PlayerControllerWeakPtr.Get());

 	if (Helper.IsValid())
@@ -55,7 +55,7 @@ void UEndSessionCallbackProxy::Activate()

 void UEndSessionCallbackProxy::OnCompleted(FName SessionName, bool bWasSuccessful)
 {
-	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("EndSessionCallback"), GEngine->GetWorldFromContextObject(WorldContextObject.Get(), EGetWorldErrorMode::LogAndReturnNull));
+	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("EndSessionCallback"), GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull));
 	Helper.QueryIDFromPlayerController(PlayerControllerWeakPtr.Get());

 	if (Helper.IsValid())
--- a/AdvancedSessions/Source/AdvancedSessions/Private/FindFriendSessionCallbackProxy.cpp
+++ b/AdvancedSessions/Source/AdvancedSessions/Private/FindFriendSessionCallbackProxy.cpp
@@ -41,18 +41,7 @@ void UFindFriendSessionCallbackProxy::Activate()
 		return;
 	}

-	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("EndSessionCallback"), GEngine->GetWorldFromContextObject(WorldContextObject.Get(), EGetWorldErrorMode::LogAndReturnNull));
-	Helper.QueryIDFromPlayerController(PlayerControllerWeakPtr.Get());
-
-	if (!Helper.IsValid())
-	{
-		// Fail immediately
-		TArray<FBlueprintSessionResult> EmptyResult;
-		OnFailure.Broadcast(EmptyResult);
-		return;
-	}
-
-	IOnlineSessionPtr Sessions = Helper.OnlineSub->GetSessionInterface();
+	IOnlineSessionPtr Sessions = Online::GetSessionInterface(GetWorld());

 	if (Sessions.IsValid())
 	{	
@@ -82,43 +71,31 @@ void UFindFriendSessionCallbackProxy::Activate()

 void UFindFriendSessionCallbackProxy::OnFindFriendSessionCompleted(int32 LocalPlayer, bool bWasSuccessful, const TArray<FOnlineSessionSearchResult>& SessionInfo)
 {
-	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("EndSessionCallback"), GEngine->GetWorldFromContextObject(WorldContextObject.Get(), EGetWorldErrorMode::LogAndReturnNull));
-	Helper.QueryIDFromPlayerController(PlayerControllerWeakPtr.Get());
+	IOnlineSessionPtr Sessions = Online::GetSessionInterface(GetWorld());

-	if (Helper.IsValid())
+	if (Sessions.IsValid())
+		Sessions->ClearOnFindFriendSessionCompleteDelegate_Handle(LocalPlayer, FindFriendSessionCompleteDelegateHandle);
+
+	if ( bWasSuccessful )
 	{ 
-		IOnlineSessionPtr Sessions = Helper.OnlineSub->GetSessionInterface();
+		TArray<FBlueprintSessionResult> Result;

-		if (Sessions.IsValid())
-			Sessions->ClearOnFindFriendSessionCompleteDelegate_Handle(LocalPlayer, FindFriendSessionCompleteDelegateHandle);
-
-		if (bWasSuccessful)
+		for (auto& Sesh : SessionInfo)
 		{
-			TArray<FBlueprintSessionResult> Result;
-
-			for (auto& Sesh : SessionInfo)
+			if (Sesh.IsValid())
 			{
-				if (Sesh.IsValid())
-				{
-					FBlueprintSessionResult BSesh;
-					BSesh.OnlineResult = Sesh;
-					Result.Add(BSesh);
-				}
-			}
-
-			if (Result.Num() > 0)
-				OnSuccess.Broadcast(Result);
-			else
-			{
-				UE_LOG(AdvancedFindFriendSessionLog, Warning, TEXT("FindFriendSession Failed, returned an invalid session."));
-				OnFailure.Broadcast(Result);
+				FBlueprintSessionResult BSesh;
+				BSesh.OnlineResult = Sesh;
+				Result.Add(BSesh);
 			}
 		}
+
+		if(Result.Num() > 0)
+			OnSuccess.Broadcast(Result);
 		else
 		{
-			UE_LOG(AdvancedFindFriendSessionLog, Warning, TEXT("FindFriendSession Failed"));
-			TArray<FBlueprintSessionResult> EmptyResult;
-			OnFailure.Broadcast(EmptyResult);
+			UE_LOG(AdvancedFindFriendSessionLog, Warning, TEXT("FindFriendSession Failed, returned an invalid session."));
+			OnFailure.Broadcast(Result);
 		}
 	}
 	else
--- a/AdvancedSessions/Source/AdvancedSessions/Private/FindSessionsCallbackProxyAdvanced.cpp
+++ b/AdvancedSessions/Source/AdvancedSessions/Private/FindSessionsCallbackProxyAdvanced.cpp
@@ -1,7 +1,6 @@
 // Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
 #include "FindSessionsCallbackProxyAdvanced.h"

-#include "Online/OnlineSessionNames.h"

 //////////////////////////////////////////////////////////////////////////
 // UFindSessionsCallbackProxyAdvanced
@@ -35,7 +34,7 @@ UFindSessionsCallbackProxyAdvanced* UFindSessionsCallbackProxyAdvanced::FindSess

 void UFindSessionsCallbackProxyAdvanced::Activate()
 {
-	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("FindSessions"), GEngine->GetWorldFromContextObject(WorldContextObject.Get(), EGetWorldErrorMode::LogAndReturnNull));
+	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("FindSessions"), GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull));
 	Helper.QueryIDFromPlayerController(PlayerControllerWeakPtr.Get());

 	if (Helper.IsValid())
@@ -116,7 +115,7 @@ void UFindSessionsCallbackProxyAdvanced::Activate()
 			{
 				tem.Set(SEARCH_PRESENCE, true, EOnlineComparisonOp::Equals);

-				if (bSearchLobbies && !IOnlineSubsystem::DoesInstanceExist("STEAM"))
+				if (bSearchLobbies)
 					tem.Set(SEARCH_LOBBIES, true, EOnlineComparisonOp::Equals);
 			}
 			break;
@@ -130,6 +129,7 @@ void UFindSessionsCallbackProxyAdvanced::Activate()
 			case EBPServerPresenceSearchType::AllServers:
 			default:
 			{
+				// Only steam uses the separate searching flags currently
 				//if (IOnlineSubsystem::DoesInstanceExist("STEAM"))
 				//{
 				bRunSecondSearch = true;
@@ -142,7 +142,7 @@ void UFindSessionsCallbackProxyAdvanced::Activate()

 				tem.Set(SEARCH_PRESENCE, true, EOnlineComparisonOp::Equals);

-				if (bSearchLobbies && !IOnlineSubsystem::DoesInstanceExist("STEAM"))
+				if (bSearchLobbies)
 					tem.Set(SEARCH_LOBBIES, true, EOnlineComparisonOp::Equals);

 				//DedicatedOnly.Set(SEARCH_DEDICATED_ONLY, true, EOnlineComparisonOp::Equals);
@@ -172,16 +172,9 @@ void UFindSessionsCallbackProxyAdvanced::Activate()

 void UFindSessionsCallbackProxyAdvanced::OnCompleted(bool bSuccess)
 {
-	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("FindSessionsCallback"), GEngine->GetWorldFromContextObject(WorldContextObject.Get(), EGetWorldErrorMode::LogAndReturnNull));
+	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("FindSessionsCallback"), GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull));
 	Helper.QueryIDFromPlayerController(PlayerControllerWeakPtr.Get());

-	if (!Helper.IsValid())
-	{
-		// Fail immediately
-		OnFailure.Broadcast(SessionSearchResults);
-		return;
-	}
-
 	if (!bRunSecondSearch && Helper.IsValid())
 	{
 		auto Sessions = Helper.OnlineSub->GetSessionInterface();
--- a/AdvancedSessions/Source/AdvancedSessions/Private/GetFriendsCallbackProxy.cpp
+++ b/AdvancedSessions/Source/AdvancedSessions/Private/GetFriendsCallbackProxy.cpp
@@ -1,9 +1,6 @@
 // Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
 #include "GetFriendsCallbackProxy.h"

-#include "Online.h"
-#include "Interfaces/OnlineFriendsInterface.h"
-#include "Interfaces/OnlinePresenceInterface.h"

 //////////////////////////////////////////////////////////////////////////
 // UGetFriendsCallbackProxy
@@ -34,23 +31,18 @@ void UGetFriendsCallbackProxy::Activate()
 		return;
 	}

-	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("GetFriends"), GEngine->GetWorldFromContextObject(WorldContextObject.Get(), EGetWorldErrorMode::LogAndReturnNull));
-	Helper.QueryIDFromPlayerController(PlayerControllerWeakPtr.Get());
-
-	if (Helper.IsValid())
+	IOnlineFriendsPtr Friends = Online::GetFriendsInterface();
+	if (Friends.IsValid())
 	{	
-		IOnlineFriendsPtr Friends = Helper.OnlineSub->GetFriendsInterface();
-		if (Friends.IsValid())
-		{
-			ULocalPlayer* Player = Cast<ULocalPlayer>(PlayerControllerWeakPtr->Player);
+		ULocalPlayer* Player = Cast<ULocalPlayer>(PlayerControllerWeakPtr->Player);

-			Friends->ReadFriendsList(Player->GetControllerId(), EFriendsLists::ToString((EFriendsLists::Default)), FriendListReadCompleteDelegate);
-			return;
-		}
+		Friends->ReadFriendsList(Player->GetControllerId(), EFriendsLists::ToString((EFriendsLists::Default)), FriendListReadCompleteDelegate);
+		return;
 	}

 	// Fail immediately
 	TArray<FBPFriendInfo> EmptyArray;
+
 	OnFailure.Broadcast(EmptyArray);
 }

@@ -58,17 +50,7 @@ void UGetFriendsCallbackProxy::OnReadFriendsListCompleted(int32 LocalUserNum, bo
 {
 	if (bWasSuccessful)
 	{
-		FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("GetFriends"), GEngine->GetWorldFromContextObject(WorldContextObject.Get(), EGetWorldErrorMode::LogAndReturnNull));
-		Helper.QueryIDFromPlayerController(PlayerControllerWeakPtr.Get());
-
-		if (!Helper.IsValid())
-		{
-			TArray<FBPFriendInfo> EmptyArray;
-			OnFailure.Broadcast(EmptyArray);
-			return;
-		}
-
-		auto Friends = Helper.OnlineSub->GetFriendsInterface();
+		IOnlineFriendsPtr Friends = Online::GetFriendsInterface();
 		if (Friends.IsValid())
 		{
 			// Not actually needed anymore, plus was not being validated and causing a crash
--- a/AdvancedSessions/Source/AdvancedSessions/Private/GetRecentPlayersCallbackProxy.cpp
+++ b/AdvancedSessions/Source/AdvancedSessions/Private/GetRecentPlayersCallbackProxy.cpp
@@ -1,7 +1,6 @@
 // Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
 #include "GetRecentPlayersCallbackProxy.h"

-#include "Online.h"

 //////////////////////////////////////////////////////////////////////////
 // UGetRecentPlayersCallbackProxy
@@ -32,16 +31,7 @@ void UGetRecentPlayersCallbackProxy::Activate()
 		return;
 	}

-	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("GetRecentPlayers"), GEngine->GetWorldFromContextObject(WorldContextObject.Get(), EGetWorldErrorMode::LogAndReturnNull));
-
-	if (!Helper.OnlineSub)
-	{
-		TArray<FBPOnlineRecentPlayer> EmptyArray;
-		OnFailure.Broadcast(EmptyArray);
-		return;
-	}
-
-	IOnlineFriendsPtr Friends = Helper.OnlineSub->GetFriendsInterface();
+	IOnlineFriendsPtr Friends = Online::GetFriendsInterface();
 	if (Friends.IsValid())
 	{	
 		DelegateHandle = Friends->AddOnQueryRecentPlayersCompleteDelegate_Handle(QueryRecentPlayersCompleteDelegate);
@@ -58,16 +48,7 @@ void UGetRecentPlayersCallbackProxy::Activate()
 void UGetRecentPlayersCallbackProxy::OnQueryRecentPlayersCompleted(const FUniqueNetId &UserID, const FString &Namespace, bool bWasSuccessful, const FString& ErrorString)
 {
 	
-	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("GetRecentPlayers"), GEngine->GetWorldFromContextObject(WorldContextObject.Get(), EGetWorldErrorMode::LogAndReturnNull));
-
-	if (!Helper.OnlineSub)
-	{
-		TArray<FBPOnlineRecentPlayer> EmptyArray;
-		OnFailure.Broadcast(EmptyArray);
-		return;
-	}
-
-	IOnlineFriendsPtr Friends = Helper.OnlineSub->GetFriendsInterface();
+	IOnlineFriendsPtr Friends = Online::GetFriendsInterface();
 	if (Friends.IsValid())
 		Friends->ClearOnQueryRecentPlayersCompleteDelegate_Handle(DelegateHandle);

--- a/AdvancedSessions/Source/AdvancedSessions/Private/GetUserPrivilegeCallbackProxy.cpp
+++ b/AdvancedSessions/Source/AdvancedSessions/Private/GetUserPrivilegeCallbackProxy.cpp
@@ -2,7 +2,6 @@

 #include "GetUserPrivilegeCallbackProxy.h"

-#include "Online.h"

 //////////////////////////////////////////////////////////////////////////
 // UGetUserPrivilegeCallbackProxy
@@ -23,14 +22,7 @@ UGetUserPrivilegeCallbackProxy* UGetUserPrivilegeCallbackProxy::GetUserPrivilege

 void UGetUserPrivilegeCallbackProxy::Activate()
 {
-	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("GetUserPrivilege"), GEngine->GetWorldFromContextObject(WorldContextObject.Get(), EGetWorldErrorMode::LogAndReturnNull));
-
-	if (!Helper.OnlineSub)
-	{
-		OnFailure.Broadcast();
-		return;
-	}
-	auto Identity = Helper.OnlineSub->GetIdentityInterface();
+	auto Identity = Online::GetIdentityInterface();

 	if (Identity.IsValid())
 	{
--- a/AdvancedSessions/Source/AdvancedSessions/Private/LoginUserCallbackProxy.cpp
+++ b/AdvancedSessions/Source/AdvancedSessions/Private/LoginUserCallbackProxy.cpp
@@ -2,7 +2,6 @@

 #include "LoginUserCallbackProxy.h"

-#include "Online.h"

 //////////////////////////////////////////////////////////////////////////
 // ULoginUserCallbackProxy
@@ -41,15 +40,8 @@ void ULoginUserCallbackProxy::Activate()
 		return;
 	}

-	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("LoginUser"), GEngine->GetWorldFromContextObject(WorldContextObject.Get(), EGetWorldErrorMode::LogAndReturnNull));
+	auto Identity = Online::GetIdentityInterface();

-	if (!Helper.OnlineSub)
-	{
-		OnFailure.Broadcast();
-		return;
-	}
-
-	auto Identity = Helper.OnlineSub->GetIdentityInterface();
 	if (Identity.IsValid())
 	{
 		// Fallback to default AuthType if nothing is specified
@@ -73,30 +65,23 @@ void ULoginUserCallbackProxy::OnCompleted(int32 LocalUserNum, bool bWasSuccessfu
 	{
 		ULocalPlayer* Player = Cast<ULocalPlayer>(PlayerControllerWeakPtr->Player);

-		FUniqueNetIdRepl UniqueID(UserId.AsShared());
+		auto uniqueId = UserId.AsShared();

 		if (Player)
 		{
-			FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("GetUserPrivilege"), GEngine->GetWorldFromContextObject(WorldContextObject.Get(), EGetWorldErrorMode::LogAndReturnNull));
+			auto Identity = Online::GetIdentityInterface();

-			if (!Helper.OnlineSub)
-			{
-				OnFailure.Broadcast();
-				return;
-			}
-
-			auto Identity = Helper.OnlineSub->GetIdentityInterface();
 			if (Identity.IsValid())
 			{
 				Identity->ClearOnLoginCompleteDelegate_Handle(Player->GetControllerId(), DelegateHandle);
 			}
-			Player->SetCachedUniqueNetId(UniqueID);
+			Player->SetCachedUniqueNetId(uniqueId);
 		}

 		if (APlayerState* State = PlayerControllerWeakPtr->PlayerState)
 		{
 			// Update UniqueId. See also ShowLoginUICallbackProxy.cpp
-			State->SetUniqueId(UniqueID);
+			State->SetUniqueId((const FUniqueNetIdPtr&)uniqueId);
 		}
 	}

--- a/AdvancedSessions/Source/AdvancedSessions/Private/LogoutUserCallbackProxy.cpp
+++ b/AdvancedSessions/Source/AdvancedSessions/Private/LogoutUserCallbackProxy.cpp
@@ -2,7 +2,6 @@

 #include "LogoutUserCallbackProxy.h"

-#include "Online.h"

 //////////////////////////////////////////////////////////////////////////
 // ULogoutUserCallbackProxy
@@ -30,6 +29,7 @@ void ULogoutUserCallbackProxy::Activate()
 		return;
 	}

+
 	ULocalPlayer* Player = Cast<ULocalPlayer>(PlayerControllerWeakPtr->Player);

 	if (!Player)
@@ -38,14 +38,7 @@ void ULogoutUserCallbackProxy::Activate()
 		return;
 	}

-	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("LogoutUser"), GEngine->GetWorldFromContextObject(WorldContextObject.Get(), EGetWorldErrorMode::LogAndReturnNull));
-
-	if (!Helper.OnlineSub)
-	{
-		OnFailure.Broadcast();
-		return;
-	}
-	auto Identity = Helper.OnlineSub->GetIdentityInterface();
+	auto Identity = Online::GetIdentityInterface();

 	if (Identity.IsValid())
 	{
@@ -67,14 +60,7 @@ void ULogoutUserCallbackProxy::OnCompleted(int LocalUserNum, bool bWasSuccessful

 		if (Player)
 		{
-			FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("LogoutUser"), GEngine->GetWorldFromContextObject(WorldContextObject.Get(), EGetWorldErrorMode::LogAndReturnNull));
-
-			if (!Helper.OnlineSub)
-			{
-				OnFailure.Broadcast();
-				return;
-			}
-			auto Identity = Helper.OnlineSub->GetIdentityInterface();
+			auto Identity = Online::GetIdentityInterface();

 			if (Identity.IsValid())
 			{
--- a/AdvancedSessions/Source/AdvancedSessions/Private/SendFriendInviteCallbackProxy.cpp
+++ b/AdvancedSessions/Source/AdvancedSessions/Private/SendFriendInviteCallbackProxy.cpp
@@ -1,7 +1,6 @@
 // Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
 #include "SendFriendInviteCallbackProxy.h"

-#include "Online.h"

 //////////////////////////////////////////////////////////////////////////
 // UGetRecentPlayersCallbackProxy
@@ -40,15 +39,7 @@ void USendFriendInviteCallbackProxy::Activate()
 		return;
 	}

-	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("SendFriendInvite"), GEngine->GetWorldFromContextObject(WorldContextObject.Get(), EGetWorldErrorMode::LogAndReturnNull));
-
-	if (!Helper.OnlineSub)
-	{
-		OnFailure.Broadcast();
-		return;
-	}
-
-	auto Friends = Helper.OnlineSub->GetFriendsInterface();
+	IOnlineFriendsPtr Friends = Online::GetFriendsInterface();
 	if (Friends.IsValid())
 	{	
 		ULocalPlayer* Player = Cast<ULocalPlayer>(PlayerControllerWeakPtr->Player);
--- a/AdvancedSessions/Source/AdvancedSessions/Private/StartSessionCallbackProxyAdvanced.cpp
+++ b/AdvancedSessions/Source/AdvancedSessions/Private/StartSessionCallbackProxyAdvanced.cpp
@@ -7,7 +7,7 @@ UStartSessionCallbackProxyAdvanced::UStartSessionCallbackProxyAdvanced(const FOb
 }

 UStartSessionCallbackProxyAdvanced* UStartSessionCallbackProxyAdvanced::StartAdvancedSession(
-	UObject* WorldContextObject)
+	const UObject* WorldContextObject)
 {
 	UStartSessionCallbackProxyAdvanced* Proxy = NewObject<UStartSessionCallbackProxyAdvanced>();
 	Proxy->WorldContextObject = WorldContextObject;
@@ -16,7 +16,9 @@ UStartSessionCallbackProxyAdvanced* UStartSessionCallbackProxyAdvanced::StartAdv

 void UStartSessionCallbackProxyAdvanced::Activate()
 {
-	const FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("StartSession"), GEngine->GetWorldFromContextObject(WorldContextObject.Get(), EGetWorldErrorMode::LogAndReturnNull));
+	const FOnlineSubsystemBPCallHelperAdvanced Helper(
+		TEXT("StartSession"),
+		GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull));

 	if (Helper.OnlineSub != nullptr)
 	{
@@ -36,11 +38,13 @@ void UStartSessionCallbackProxyAdvanced::Activate()

 void UStartSessionCallbackProxyAdvanced::OnStartCompleted(FName SessionName, bool bWasSuccessful)
 {
-	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("StartSessionCallback"), GEngine->GetWorldFromContextObject(WorldContextObject.Get(), EGetWorldErrorMode::LogAndReturnNull));
+	const FOnlineSubsystemBPCallHelperAdvanced Helper(
+		TEXT("StartSessionCallback"),
+		GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull));

 	if (Helper.OnlineSub != nullptr)
 	{
-		auto Sessions = Helper.OnlineSub->GetSessionInterface();
+		const auto Sessions = Helper.OnlineSub->GetSessionInterface();
 		if (Sessions.IsValid())
 		{
 			Sessions->ClearOnStartSessionCompleteDelegate_Handle(StartCompleteDelegateHandle);
--- a/AdvancedSessions/Source/AdvancedSessions/Private/UpdateSessionCallbackProxyAdvanced.cpp
+++ b/AdvancedSessions/Source/AdvancedSessions/Private/UpdateSessionCallbackProxyAdvanced.cpp
@@ -30,7 +30,7 @@ UUpdateSessionCallbackProxyAdvanced* UUpdateSessionCallbackProxyAdvanced::Update

 void UUpdateSessionCallbackProxyAdvanced::Activate()
 {
-	const FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("UpdateSession"), GEngine->GetWorldFromContextObject(WorldContextObject.Get(), EGetWorldErrorMode::LogAndReturnNull));
+	const FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("UpdateSession"), GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull));

 	if (Helper.OnlineSub != nullptr)
 	{
@@ -105,7 +105,7 @@ void UUpdateSessionCallbackProxyAdvanced::Activate()

 void UUpdateSessionCallbackProxyAdvanced::OnUpdateCompleted(FName SessionName, bool bWasSuccessful)
 {
-	const FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("UpdateSessionCallback"), GEngine->GetWorldFromContextObject(WorldContextObject.Get(), EGetWorldErrorMode::LogAndReturnNull));
+	const FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("UpdateSessionCallback"), GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull));

 	if (Helper.OnlineSub != nullptr)
 	{
--- a/AdvancedSteamSessions/AdvancedSteamSessions.uplugin
+++ b/AdvancedSteamSessions/AdvancedSteamSessions.uplugin
@@ -2,8 +2,8 @@
    "FileVersion" : 3,
 
    "FriendlyName" : "Advanced Steam Sessions",
-    "Version" : 5.1,
-    "VersionName": "5.1",
+    "Version" : 4.27,
+    "VersionName": "4.27",
    "Description" : "Adds new blueprint functions to handle more advanced session operations in Steam. REQUIRES ADVANCED SESSIONS",
    "Category" : "Advanced Sessions Plugin",
    "CreatedBy" : "Joshua Statzer",
@@ -11,11 +11,11 @@
 
    "Modules" :
    [
-			{
-				"Name": "AdvancedSteamSessions",
-				"Type": "RunTime",
-				"LoadingPhase": "Default"
-			} 
+        {
+            "Name" : "AdvancedSteamSessions",
+            "Type" : "RunTime",
+			"LoadingPhase" : "PreDefault"
+        } 
    ],
 	"Plugins": [
 		{
@@ -30,6 +30,10 @@
 			"Name": "OnlineSubsystemUtils",
 			"Enabled": true
 		},
+		{
+			"Name": "OnlineSubsystemSteam",
+			"Enabled": true
+		},
 		{
 			"Name": "SteamShared",
 			"Enabled": true
--- a/AdvancedSteamSessions/Config/FilterPlugin.ini
+++ b/AdvancedSteamSessions/Config/FilterPlugin.ini
@@ -1,8 +0,0 @@
-[FilterPlugin]
-; This section lists additional files which will be packaged along with your plugin. Paths should be listed relative to the root plugin directory, and
-; may include "...", "*", and "?" wildcards to match directories, files, and individual characters respectively.
-;
-; Examples:
-;    /README.txt
-;    /Extras/...
-;    /Binaries/ThirdParty/*.dll
--- a/AdvancedSteamSessions/Source/AdvancedSteamSessions/AdvancedSteamSessions.Build.cs
+++ b/AdvancedSteamSessions/Source/AdvancedSteamSessions/AdvancedSteamSessions.Build.cs
@@ -13,10 +13,10 @@ public class AdvancedSteamSessions : ModuleRules
        PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore", "OnlineSubsystem", "CoreUObject", "OnlineSubsystemUtils", "Networking", "Sockets", "AdvancedSessions"/*"Voice", "OnlineSubsystemSteam"*/ });
        PrivateDependencyModuleNames.AddRange(new string[] { "OnlineSubsystem", "Sockets", "Networking", "OnlineSubsystemUtils" /*"Voice", "Steamworks","OnlineSubsystemSteam"*/});

-        if ((Target.Platform == UnrealTargetPlatform.Win64) || (Target.Platform == UnrealTargetPlatform.Linux) || (Target.Platform == UnrealTargetPlatform.Mac))
+        if ((Target.Platform == UnrealTargetPlatform.Win64) || (Target.Platform == UnrealTargetPlatform.Win32) || (Target.Platform == UnrealTargetPlatform.Linux) || (Target.Platform == UnrealTargetPlatform.Mac))
        {
-            PublicDependencyModuleNames.AddRange(new string[] { "SteamShared", "Steamworks"/*, "OnlineSubsystemSteam"*/ });
-            //PublicIncludePaths.AddRange(new string[] { "../Plugins/Online/OnlineSubsystemSteam/Source/Private" });// This is dumb but it isn't very open
+            PublicDependencyModuleNames.AddRange(new string[] { "Steamworks",/*"Voice",*/ "OnlineSubsystemSteam" });
+            PublicIncludePaths.AddRange(new string[] { "../Plugins/Online/OnlineSubsystemSteam/Source/Private" });// This is dumb but it isn't very open
        }
    }
 }
--- a/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamFriendsLibrary.h
+++ b/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamFriendsLibrary.h
@@ -25,7 +25,7 @@
 #pragma warning(disable:4265) // SteamAPI CCallback< specifically, this warning is off by default but 4.17 turned it on....
 #endif

-#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX)
+#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX

 #pragma push_macro("ARRAY_COUNT")
 #undef ARRAY_COUNT
@@ -194,10 +194,11 @@ public:
 		}
 	}

-
-	virtual uint32 GetTypeHash() const override
+	/** Needed for TMap::GetTypeHash() */
+	friend uint32 GetTypeHash(const FUniqueNetIdSteam2& A)
 	{
-		return ::GetTypeHash(UniqueNetId);
+		return GetTypeHash(A.UniqueNetId);
+		//return (uint32)(A.UniqueNetId) + ((uint32)((A.UniqueNetId) >> 32) * 23);
 	}

 	/** Convenience cast to CSteamID */
@@ -267,15 +268,12 @@ enum class ESteamUserOverlayType : uint8
 	/*Opens the overlay in minimal mode prompting the user to accept an incoming friend invite.*/
 	friendrequestaccept,
 	/*Opens the overlay in minimal mode prompting the user to ignore an incoming friend invite.*/
-	friendrequestignore,
-	/*Opens the invite overlay, invitations sent from this dialog will be for the provided lobby*/
-	invitetolobby
+	friendrequestignore
 };

 static FString EnumToString(const FString& enumName, uint8 value)
 {
-	
-	const UEnum* EnumPtr = FindFirstObject<UEnum>(*enumName, EFindFirstObjectOptions::None, ELogVerbosity::Warning, TEXT("EumtoString"));
+	const UEnum* EnumPtr = FindObject<UEnum>(ANY_PACKAGE, *enumName, true);

 	if (!EnumPtr)
 		return FString();
@@ -299,11 +297,11 @@ public:
 	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Online|SteamAPI|SteamGroups")
 		FString GroupTag;
 	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Online|SteamAPI|SteamGroups")
-		int32 numOnline = 0;
+		int32 numOnline;
 	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Online|SteamAPI|SteamGroups")
-		int32 numInGame = 0;
+		int32 numInGame;
 	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Online|SteamAPI|SteamGroups")
-		int32 numChatting = 0;
+		int32 numChatting;

 };

--- a/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamWorkshopLibrary.h
+++ b/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamWorkshopLibrary.h
@@ -6,7 +6,7 @@
 #include "Kismet/BlueprintFunctionLibrary.h"
 #include "Online.h"
 #include "OnlineSubsystem.h"
-#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX)
+#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
 #include "steam/isteamugc.h"
 #include "steam/isteamremotestorage.h"
 #endif
@@ -21,7 +21,7 @@
 #pragma warning(disable:4265) // SteamAPI CCallback< specifically, this warning is off by default but 4.17 turned it on....
 #endif

-#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX)
+#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX

 #pragma push_macro("ARRAY_COUNT")
 #undef ARRAY_COUNT
@@ -223,7 +223,7 @@ public:
 		bTagsTruncated = false;
 	}

-#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX)
+#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
 	FBPSteamWorkshopItemDetails(SteamUGCDetails_t &hUGCDetails)
 	{
 		ResultOfRequest = (FBPSteamResult)hUGCDetails.m_eResult;
--- a/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamNotificationsSubsystem.h
+++ b/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamNotificationsSubsystem.h
@@ -1,87 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-#pragma once
-
-#include "CoreMinimal.h"
-#include "Subsystems/GameInstanceSubsystem.h"
-
-#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX)
-
-#include <steam/steam_api.h>
-
-#endif
-
-#include "SteamNotificationsSubsystem.generated.h"
-
-DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FOnSteamOverlayActivated, bool, bOverlayState);
-
-UCLASS()
-class ADVANCEDSTEAMSESSIONS_API USteamNotificationsSubsystem : public UGameInstanceSubsystem
-{
-	GENERATED_BODY()
-
-public:
-	
-	// Event thrown when the steam overlay switches states
-	UPROPERTY(BlueprintAssignable, Category = "SteamEvents")
-		FOnSteamOverlayActivated OnSteamOverlayActivated_Bind;
-	
-	USteamNotificationsSubsystem() : Super()
-	{
-
-	}
-
-	class cSteamEventsStore
-	{
-	public:
-		USteamNotificationsSubsystem* ParentSubsystem = nullptr;
-		void Initialize(USteamNotificationsSubsystem* MyParent)
-		{
-			ParentSubsystem = MyParent;
-		}
-
-#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX)
-		cSteamEventsStore() :
-		OnExternalUITriggeredCallback(this, &cSteamEventsStore::OnExternalUITriggered)
-		{
-
-		}
-#else
-		//cSteamEventsStore()
-		//{
-
-		//}
-#endif
-
-		//~cSteamEventsStore(){}
-
-	private:
-#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX)
-		STEAM_CALLBACK(cSteamEventsStore, OnExternalUITriggered, GameOverlayActivated_t, OnExternalUITriggeredCallback);
-#endif
-	};
-
-	cSteamEventsStore MyEvents;
-
-	/** Implement this for initialization of instances of the system */
-	virtual void Initialize(FSubsystemCollectionBase& Collection) override
-	{
-		MyEvents.Initialize(this);
-	}
-
-	/** Implement this for deinitialization of instances of the system */
-	virtual void Deinitialize() override
-	{
-
-	}
-};
-
-#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX)
-void USteamNotificationsSubsystem::cSteamEventsStore::OnExternalUITriggered(GameOverlayActivated_t* CallbackData)
-{
-	if (ParentSubsystem)
-	{
-		ParentSubsystem->OnSteamOverlayActivated_Bind.Broadcast((bool)CallbackData->m_bActive);
-	}
-}
-#endif
--- a/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamRequestGroupOfficersCallbackProxy.h
+++ b/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamRequestGroupOfficersCallbackProxy.h
@@ -15,9 +15,9 @@
 #pragma warning(disable:4265) // SteamAPI CCallback< specifically, this warning is off by default but 4.17 turned it on....
 #endif

-#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX)
+#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX

-//#include "OnlineSubsystemSteam.h"
+#include "OnlineSubsystemSteam.h"

 #pragma push_macro("ARRAY_COUNT")
 #undef ARRAY_COUNT
@@ -55,7 +55,7 @@ public:
 	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Online|SteamAPI|SteamGroups")
 		FBPUniqueNetId OfficerUniqueNetID; // Uint64 representation
 	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Online|SteamAPI|SteamGroups")
-		bool bIsOwner = false;
+	bool bIsOwner;

 };

@@ -87,7 +87,7 @@ class USteamRequestGroupOfficersCallbackProxy : public UOnlineBlueprintCallProxy

 private:

-#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX)
+#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
 	void OnRequestGroupOfficerDetails( ClanOfficerListResponse_t *pResult, bool bIOFailure);
 	CCallResult<USteamRequestGroupOfficersCallbackProxy, ClanOfficerListResponse_t> m_callResultGroupOfficerRequestDetails;

--- a/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamWSRequestUGCDetailsCallbackProxy.h
+++ b/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamWSRequestUGCDetailsCallbackProxy.h
@@ -16,9 +16,9 @@
 #pragma warning(disable:4265) // SteamAPI CCallback< specifically, this warning is off by default but 4.17 turned it on....
 #endif

-#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX)
+#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX

-//#include "OnlineSubsystemSteam.h"
+#include "OnlineSubsystemSteam.h"

 #pragma push_macro("ARRAY_COUNT")
 #undef ARRAY_COUNT
@@ -72,7 +72,7 @@ class USteamWSRequestUGCDetailsCallbackProxy : public UOnlineBlueprintCallProxyB

 private:
 	
-#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX)
+#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
 	// Internal callback when the operation completes, calls out to the public success/failure callbacks
 		
 	void OnUGCRequestUGCDetails(SteamUGCQueryCompleted_t *pResult, bool bIOFailure);
--- a/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamFriendsLibrary.cpp
+++ b/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamFriendsLibrary.cpp
@@ -10,7 +10,7 @@ DEFINE_LOG_CATEGORY(AdvancedSteamFriendsLog);
 /*int32 UAdvancedSteamFriendsLibrary::GetFriendSteamLevel(const FBPUniqueNetId UniqueNetId)
 {

-#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX)
+#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
 	if (!UniqueNetId.IsValid() || !UniqueNetId.UniqueNetId->IsValid() || UniqueNetId.UniqueNetId->GetType() != STEAM_SUBSYSTEM)
 	{
 		UE_LOG(AdvancedSteamFriendsLog, Warning, TEXT("IsAFriend Had a bad UniqueNetId!"));
@@ -59,7 +59,7 @@ DEFINE_LOG_CATEGORY(AdvancedSteamFriendsLog);
 void UAdvancedSteamFriendsLibrary::GetSteamGroups(TArray<FBPSteamGroupInfo> & SteamGroups)
 {
 	
-#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX)
+#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX

 	if (SteamAPI_Init())
 	{
@@ -90,7 +90,7 @@ void UAdvancedSteamFriendsLibrary::GetSteamGroups(TArray<FBPSteamGroupInfo> & St
 void UAdvancedSteamFriendsLibrary::GetSteamFriendGamePlayed(const FBPUniqueNetId UniqueNetId, EBlueprintResultSwitch &Result/*, FString & GameName*/, int32 & AppID)
 {

-#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX)
+#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
 	if (!UniqueNetId.IsValid() || !UniqueNetId.UniqueNetId->IsValid() || UniqueNetId.UniqueNetId->GetType() != STEAM_SUBSYSTEM)
 	{
 		UE_LOG(AdvancedSteamFriendsLog, Warning, TEXT("GetSteamFriendGamePlayed Had a bad UniqueNetId!"));
@@ -132,7 +132,7 @@ void UAdvancedSteamFriendsLibrary::GetSteamFriendGamePlayed(const FBPUniqueNetId
 int32 UAdvancedSteamFriendsLibrary::GetFriendSteamLevel(const FBPUniqueNetId UniqueNetId)
 {

-#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX)
+#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
 	if (!UniqueNetId.IsValid() || !UniqueNetId.UniqueNetId->IsValid() || UniqueNetId.UniqueNetId->GetType() != STEAM_SUBSYSTEM)
 	{
 		UE_LOG(AdvancedSteamFriendsLog, Warning, TEXT("IsAFriend Had a bad UniqueNetId!"));
@@ -153,7 +153,7 @@ int32 UAdvancedSteamFriendsLibrary::GetFriendSteamLevel(const FBPUniqueNetId Uni
 FString UAdvancedSteamFriendsLibrary::GetSteamPersonaName(const FBPUniqueNetId UniqueNetId)
 {

-#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX)
+#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
 	if (!UniqueNetId.IsValid() || !UniqueNetId.UniqueNetId->IsValid() || UniqueNetId.UniqueNetId->GetType() != STEAM_SUBSYSTEM)
 	{
 		UE_LOG(AdvancedSteamFriendsLog, Warning, TEXT("GetSteamPersonaName Had a bad UniqueNetId!"));
@@ -175,7 +175,7 @@ FBPUniqueNetId UAdvancedSteamFriendsLibrary::CreateSteamIDFromString(const FStri
 {
 	FBPUniqueNetId netId;
 	
-#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX)
+#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
 	if (!(SteamID64.Len() > 0))
 	{
 		UE_LOG(AdvancedSteamFriendsLog, Warning, TEXT("CreateSteamIDFromString Had a bad UniqueNetId!"));
@@ -200,7 +200,7 @@ FBPUniqueNetId UAdvancedSteamFriendsLibrary::GetLocalSteamIDFromSteam()
 {
 	FBPUniqueNetId netId;

-#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX)
+#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
 	if (SteamAPI_Init())
 	{
 		TSharedPtr<const FUniqueNetId> SteamID(new const FUniqueNetIdSteam2(SteamUser()->GetSteamID()));
@@ -213,7 +213,7 @@ FBPUniqueNetId UAdvancedSteamFriendsLibrary::GetLocalSteamIDFromSteam()

 bool UAdvancedSteamFriendsLibrary::RequestSteamFriendInfo(const FBPUniqueNetId UniqueNetId, bool bRequireNameOnly)
 {
-#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX)
+#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
 	if (!UniqueNetId.IsValid() || !UniqueNetId.UniqueNetId->IsValid() || UniqueNetId.UniqueNetId->GetType() != STEAM_SUBSYSTEM)
 	{
 		UE_LOG(AdvancedSteamFriendsLog, Warning, TEXT("RequestSteamFriendInfo Had a bad UniqueNetId!"));
@@ -235,7 +235,7 @@ bool UAdvancedSteamFriendsLibrary::RequestSteamFriendInfo(const FBPUniqueNetId U

 bool UAdvancedSteamFriendsLibrary::OpenSteamUserOverlay(const FBPUniqueNetId UniqueNetId, ESteamUserOverlayType DialogType)
 {
-#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX)
+#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
 	if (!UniqueNetId.IsValid() || !UniqueNetId.UniqueNetId->IsValid() || UniqueNetId.UniqueNetId->GetType() != STEAM_SUBSYSTEM)
 	{
 		UE_LOG(AdvancedSteamFriendsLog, Warning, TEXT("OpenSteamUserOverlay Had a bad UniqueNetId!"));
@@ -245,15 +245,8 @@ bool UAdvancedSteamFriendsLibrary::OpenSteamUserOverlay(const FBPUniqueNetId Uni
 	if (SteamAPI_Init())
 	{
 		uint64 id = *((uint64*)UniqueNetId.UniqueNetId->GetBytes());
-		if (DialogType == ESteamUserOverlayType::invitetolobby)
-		{
-			SteamFriends()->ActivateGameOverlayInviteDialog(id);
-		}
-		else
-		{
-			FString DialogName = EnumToString("ESteamUserOverlayType", (uint8)DialogType);
-			SteamFriends()->ActivateGameOverlayToUser(TCHAR_TO_ANSI(*DialogName), id);
-		}
+		FString DialogName = EnumToString("ESteamUserOverlayType", (uint8)DialogType);
+		SteamFriends()->ActivateGameOverlayToUser(TCHAR_TO_ANSI(*DialogName), id);
 		return true;
 	}
 #endif
@@ -264,7 +257,7 @@ bool UAdvancedSteamFriendsLibrary::OpenSteamUserOverlay(const FBPUniqueNetId Uni

 bool UAdvancedSteamFriendsLibrary::IsOverlayEnabled()
 {
-#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX)
+#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
 	if (SteamAPI_Init())
 	{
 		return SteamUtils()->IsOverlayEnabled();
@@ -277,7 +270,7 @@ bool UAdvancedSteamFriendsLibrary::IsOverlayEnabled()

 UTexture2D * UAdvancedSteamFriendsLibrary::GetSteamFriendAvatar(const FBPUniqueNetId UniqueNetId, EBlueprintAsyncResultSwitch &Result, SteamAvatarSize AvatarSize)
 {
-#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX)
+#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
 	if (!UniqueNetId.IsValid() || !UniqueNetId.UniqueNetId->IsValid() || UniqueNetId.UniqueNetId->GetType() != STEAM_SUBSYSTEM)
 	{
 		UE_LOG(AdvancedSteamFriendsLog, Warning, TEXT("GetSteamFriendAvatar Had a bad UniqueNetId!"));
@@ -339,22 +332,19 @@ UTexture2D * UAdvancedSteamFriendsLibrary::GetSteamFriendAvatar(const FBPUniqueN

 			UTexture2D* Avatar = UTexture2D::CreateTransient(Width, Height, PF_R8G8B8A8);
 			// Switched to a Memcpy instead of byte by byte transer
+			uint8* MipData = (uint8*)Avatar->PlatformData->Mips[0].BulkData.Lock(LOCK_READ_WRITE);
+			FMemory::Memcpy(MipData, (void*)oAvatarRGBA, Height * Width * 4);
+			Avatar->PlatformData->Mips[0].BulkData.Unlock();

-			if (FTexturePlatformData* PlatformData = Avatar->GetPlatformData())
-			{
-				uint8* MipData = (uint8*)PlatformData->Mips[0].BulkData.Lock(LOCK_READ_WRITE);
-				FMemory::Memcpy(MipData, (void*)oAvatarRGBA, Height * Width * 4);
-				PlatformData->Mips[0].BulkData.Unlock();
-
-				//Setting some Parameters for the Texture and finally returning it
-				PlatformData->SetNumSlices(1);
-				Avatar->NeverStream = true;
-				//Avatar->CompressionSettings = TC_EditorIcon;
-			}
-
-			// Free RGBA buffer regardless of whether it was used or not
+			// Original implementation was missing this!!
+			// the hell man......
 			delete[] oAvatarRGBA;

+			//Setting some Parameters for the Texture and finally returning it
+			Avatar->PlatformData->SetNumSlices(1);
+			Avatar->NeverStream = true;
+			//Avatar->CompressionSettings = TC_EditorIcon;
+
 			Avatar->UpdateResource();

 			Result = EBlueprintAsyncResultSwitch::OnSuccess;
@@ -377,7 +367,7 @@ UTexture2D * UAdvancedSteamFriendsLibrary::GetSteamFriendAvatar(const FBPUniqueN

 bool UAdvancedSteamFriendsLibrary::InitTextFiltering()
 {
-#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX)
+#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX

 	if (SteamAPI_Init())
 	{
@@ -391,7 +381,7 @@ bool UAdvancedSteamFriendsLibrary::InitTextFiltering()

 bool UAdvancedSteamFriendsLibrary::FilterText(FString TextToFilter, EBPTextFilteringContext Context, const FBPUniqueNetId TextSourceID, FString& FilteredText)
 {
-#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX)
+#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX

 	if (SteamAPI_Init())
 	{
@@ -405,7 +395,18 @@ bool UAdvancedSteamFriendsLibrary::FilterText(FString TextToFilter, EBPTextFilte
 			id = *((uint64*)TextSourceID.UniqueNetId->GetBytes());
 		}
 		
+		// MAC is bugged with current steam version according to epic, they forced it to be the old steam ver
+#if PLATFORM_MAC
+			// Filters the provided input message and places the filtered result into pchOutFilteredText.
+			//   pchOutFilteredText is where the output will be placed, even if no filtering or censoring is performed
+			//   nByteSizeOutFilteredText is the size (in bytes) of pchOutFilteredText
+			//   pchInputText is the input string that should be filtered, which can be ASCII or UTF-8
+			//   bLegalOnly should be false if you want profanity and legally required filtering (where required) and true if you want legally required filtering only
+			//   Returns the number of characters (not bytes) filtered.
+			int FilterCount = SteamUtils()->FilterText(OutText, BufferLen, TCHAR_TO_ANSI(*TextToFilter), Context == EBPTextFilteringContext::FContext_GameContent);
+#else
 		int FilterCount = SteamUtils()->FilterText((ETextFilteringContext)Context, id, TCHAR_TO_ANSI(*TextToFilter), OutText, BufferLen);
+#endif

 		if (FilterCount > 0)
 		{
@@ -425,7 +426,7 @@ bool UAdvancedSteamFriendsLibrary::FilterText(FString TextToFilter, EBPTextFilte

 bool UAdvancedSteamFriendsLibrary::IsSteamInBigPictureMode()
 {
-#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX)
+#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX

 	if (SteamAPI_Init())
 	{
--- a/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamWorkshopLibrary.cpp
+++ b/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamWorkshopLibrary.cpp
@@ -8,7 +8,7 @@ DEFINE_LOG_CATEGORY(AdvancedSteamWorkshopLog);
 void UAdvancedSteamWorkshopLibrary::GetNumSubscribedWorkshopItems(int32 & NumberOfItems)
 {
 	NumberOfItems = 0;
-#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX)
+#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX

 	if (SteamAPI_Init())
 	{
@@ -31,7 +31,7 @@ TArray<FBPSteamWorkshopID> UAdvancedSteamWorkshopLibrary::GetSubscribedWorkshopI
 	TArray<FBPSteamWorkshopID> outArray;
 	NumberOfItems = 0;

-#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX)
+#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX

 	if (SteamAPI_Init())
 	{
--- a/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamRequestGroupOfficersCallbackProxy.cpp
+++ b/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamRequestGroupOfficersCallbackProxy.cpp
@@ -1,10 +1,10 @@
 // Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.

 #include "SteamRequestGroupOfficersCallbackProxy.h"
-#include "Online/CoreOnline.h"
+#include "UObject/CoreOnline.h"
 #include "AdvancedSteamFriendsLibrary.h"
 #include "OnlineSubSystemHeader.h"
-#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX)
+#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
 #include "steam/isteamfriends.h"
 #endif
 //#include "OnlineSubsystemSteamTypes.h"
@@ -31,7 +31,7 @@ USteamRequestGroupOfficersCallbackProxy* USteamRequestGroupOfficersCallbackProxy

 void USteamRequestGroupOfficersCallbackProxy::Activate()
 {
-#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX)
+#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
 	if (SteamAPI_Init())
 	{
 		uint64 id = *((uint64*)GroupUniqueID.UniqueNetId->GetBytes());
@@ -45,22 +45,22 @@ void USteamRequestGroupOfficersCallbackProxy::Activate()
 	OnFailure.Broadcast(EmptyArray);
 }

-#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX)
+#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
 void USteamRequestGroupOfficersCallbackProxy::OnRequestGroupOfficerDetails(ClanOfficerListResponse_t *pResult, bool bIOFailure)
 {
 	TArray<FBPSteamGroupOfficer> OfficerArray;
 	
-	//FOnlineSubsystemSteam* SteamSubsystem = (FOnlineSubsystemSteam*)(IOnlineSubsystem::Get(STEAM_SUBSYSTEM));
+	FOnlineSubsystemSteam* SteamSubsystem = (FOnlineSubsystemSteam*)(IOnlineSubsystem::Get(STEAM_SUBSYSTEM));

 	if (bIOFailure || !pResult || !pResult->m_bSuccess)
 	{
-		//if (SteamSubsystem != nullptr)
+		if (SteamSubsystem != nullptr)
 		{
-		//	SteamSubsystem->ExecuteNextTick([this]()
-			//{
+			SteamSubsystem->ExecuteNextTick([this]()
+			{
 				TArray<FBPSteamGroupOfficer> FailureArray;
 				OnFailure.Broadcast(FailureArray);
-			//});
+			});
 		}
 		//OnFailure.Broadcast(OfficerArray);
 		return;
@@ -91,26 +91,26 @@ void USteamRequestGroupOfficersCallbackProxy::OnRequestGroupOfficerDetails(ClanO
 			OfficerArray.Add(Officer);
 		}

-		//if (SteamSubsystem != nullptr)
-		//{
-			//SteamSubsystem->ExecuteNextTick([OfficerArray, this]()
-			//{
+		if (SteamSubsystem != nullptr)
+		{
+			SteamSubsystem->ExecuteNextTick([OfficerArray, this]()
+			{
 				OnSuccess.Broadcast(OfficerArray);
-			//});
-		//}
+			});
+		}

 		//OnSuccess.Broadcast(OfficerArray);
 		return;
 	}
 	else
 	{
-		//if (SteamSubsystem != nullptr)
+		if (SteamSubsystem != nullptr)
 		{
-			//SteamSubsystem->ExecuteNextTick([this]()
-			//{
+			SteamSubsystem->ExecuteNextTick([this]()
+			{
 				TArray<FBPSteamGroupOfficer> FailureArray;
 				OnFailure.Broadcast(FailureArray);
-			//});
+			});
 		}
 	}

--- a/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamWSRequestUGCDetailsCallbackProxy.cpp
+++ b/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamWSRequestUGCDetailsCallbackProxy.cpp
@@ -2,7 +2,7 @@

 #include "SteamWSRequestUGCDetailsCallbackProxy.h"
 #include "OnlineSubSystemHeader.h"
-#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX)
+#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
 #include "steam/isteamugc.h"
 #endif

@@ -25,7 +25,7 @@ USteamWSRequestUGCDetailsCallbackProxy* USteamWSRequestUGCDetailsCallbackProxy::

 void USteamWSRequestUGCDetailsCallbackProxy::Activate()
 {
-#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX)
+#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
 	if (SteamAPI_Init())
 	{
 		// #TODO: Support arrays instead in the future?
@@ -49,19 +49,19 @@ void USteamWSRequestUGCDetailsCallbackProxy::Activate()
 	OnFailure.Broadcast(FBPSteamWorkshopItemDetails());
 }

-#if STEAM_SDK_INSTALLED && (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX)
+#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
 void USteamWSRequestUGCDetailsCallbackProxy::OnUGCRequestUGCDetails(SteamUGCQueryCompleted_t *pResult, bool bIOFailure)
 {	
-	//FOnlineSubsystemSteam* SteamSubsystem = (FOnlineSubsystemSteam*)(IOnlineSubsystem::Get(STEAM_SUBSYSTEM));
+	FOnlineSubsystemSteam* SteamSubsystem = (FOnlineSubsystemSteam*)(IOnlineSubsystem::Get(STEAM_SUBSYSTEM));

 	if (bIOFailure || !pResult || pResult->m_unNumResultsReturned <= 0)
 	{
-		//if (SteamSubsystem != nullptr)
+		if (SteamSubsystem != nullptr)
 		{
-		//	SteamSubsystem->ExecuteNextTick([this]()
-			//{
+			SteamSubsystem->ExecuteNextTick([this]()
+			{
 				OnFailure.Broadcast(FBPSteamWorkshopItemDetails());
-			//});
+			});
 		}
 		//OnFailure.Broadcast(FBPSteamWorkshopItemDetails());
 		return;
@@ -71,12 +71,12 @@ void USteamWSRequestUGCDetailsCallbackProxy::OnUGCRequestUGCDetails(SteamUGCQuer
 		SteamUGCDetails_t Details;
 		if (SteamUGC()->GetQueryUGCResult(pResult->m_handle, 0, &Details))
 		{
-			//if (SteamSubsystem != nullptr)
+			if (SteamSubsystem != nullptr)
 			{
-				//SteamSubsystem->ExecuteNextTick([Details, this]()
-				//{
+				SteamSubsystem->ExecuteNextTick([Details, this]()
+				{
 					OnSuccess.Broadcast(FBPSteamWorkshopItemDetails(Details));
-				//});
+				});
 			}

 			//OnSuccess.Broadcast(FBPSteamWorkshopItemDetails(Details));
@@ -85,12 +85,12 @@ void USteamWSRequestUGCDetailsCallbackProxy::OnUGCRequestUGCDetails(SteamUGCQuer
 	}
 	else
 	{
-		//if (SteamSubsystem != nullptr)
+		if (SteamSubsystem != nullptr)
 		{
-			//SteamSubsystem->ExecuteNextTick([this]()
-			//{
+			SteamSubsystem->ExecuteNextTick([this]()
+			{
 				OnFailure.Broadcast(FBPSteamWorkshopItemDetails());
-			//});
+			});
 		}
 	}
Author	SHA1	Message	Date
Joshua (MordenTral) Statzer	d05e0a0d79	Adding function to get the net id of a session owner	2025-09-26 08:37:07 -04:00
Joshua	141b15c4e4	update session add advertisement	2023-07-26 08:53:58 -04:00
Joshua	d61c55862f	fix multiple session results when searching both dedicated and lobbies fix multiple session results when searching both dedicated and lobbies, its not a problem on steam but with lan and such it returns the same results as it doesn't care about presence.	2023-01-25 15:01:00 -05:00
Joshua	3d024ae1c7	set cached unique net id in auto login as well	2022-08-30 08:42:18 -04:00
Joshua	baed5da63a	fixed setting should advertise twice	2022-08-22 15:11:22 -04:00
mordentral	13c795a6e5	fix 4.27 compilation differences	2022-07-14 21:19:05 -04:00
Joshua	ef928edaef	correct this pull request for ue5	2022-07-14 21:07:45 -04:00
Joshua (MordenTral) Statzer	6e6b596ec4	Merge pull request #24 from lotodore/login_update_playerstate_uniqueid Update PlayerState UniqueId after Login Good pull request, accepted	2022-07-14 21:07:45 -04:00
Joshua (MordenTral) Statzer	62c655cfa7	Merge pull request #25 from lotodore/change_type_to_authtype Rename Login parameter "Type" to "AuthType". Not a relevant change, it predates EOS, but will merge for clarity	2022-07-14 21:07:45 -04:00
Joshua	6c5f3b8b06	correct the create session node not passing on bAllowJoingViaPresence	2022-06-24 08:10:21 -04:00
Joshua	1dbd091e01	test fix	2022-04-27 11:59:31 -04:00
Joshua	d1a0b48668	forcing steam shared on forcing steam shared on, its off by default and including steam subsystem isn't automatically turning it on.	2022-04-26 09:01:54 -04:00
Joshua	3b7ec6ba65	whoops	2022-04-08 12:03:52 -04:00
Joshua	e60ee9cf40	re-enabling end session	2022-04-08 10:54:17 -04:00
Joshua (MordenTral) Statzer	af1eb9342f	Merge pull request #32 from mrcodesx/issue-31 issue-31: Add option to skip starting a game session after it's created	2022-04-08 10:50:22 -04:00
MrCodesX	dbc60b5046	issue-31: Add node to start a game session	2022-03-26 02:26:59 -06:00
MrCodesX	4ad2cf5139	issue-31: Add option to skip starting a session	2022-03-26 02:26:37 -06:00