Config/DefaultEngine.ini

@@ -4,17 +4,15 @@
 +EditProfiles=(Name="Trigger",CustomResponses=((Channel=Projectile, Response=ECR_Ignore)))
 
 [/Script/EngineSettings.GameMapsSettings]
-EditorStartupMap=/Game/MainMenu/MAP_MainMenu.MAP_MainMenu
+EditorStartupMap=/Game/FirstPerson/Maps/FirstPersonMap.FirstPersonMap
 LocalMapOptions=
-TransitionMap=None
+TransitionMap=
 bUseSplitscreen=True
 TwoPlayerSplitscreenLayout=Horizontal
 ThreePlayerSplitscreenLayout=FavorTop
-FourPlayerSplitscreenLayout=Grid
-bOffsetPlayerGamepadIds=False
-GameInstanceClass=/Game/Blueprints/GI_Monolith.GI_Monolith_C
-GameDefaultMap=/Game/MainMenu/MAP_MainMenu.MAP_MainMenu
-ServerDefaultMap=/Engine/Maps/Entry.Entry
+GameInstanceClass=/Script/Engine.GameInstance
+GameDefaultMap=/Game/FirstPerson/Maps/FirstPersonMap.FirstPersonMap
+ServerDefaultMap=/Engine/Maps/Entry
 GlobalDefaultGameMode=/Game/FirstPerson/Blueprints/BP_FirstPersonGameMode.BP_FirstPersonGameMode_C
 GlobalDefaultServerGameMode=None
 
@@ -95,22 +93,3 @@ ConnectionType=USBOnly
 bUseManualIPAddress=False
 ManualIPAddress=
 
-[/Script/Engine.GameEngine]
-+NetDriverDefinitions=(DefName="GameNetDriver",DriverClassName="OnlineSubsystemSteam.SteamNetDriver",DriverClassNameFallback="OnlineSubsystemUtils.IpNetDriver")
-
-[OnlineSubsystem]
-DefaultPlatformService=Steam
-
-[OnlineSubsystemSteam]
-bEnabled=true
-SteamDevAppId=480
-
-; If using Sessions
-bInitServerOnClient=true
-
-[/Script/OnlineSubsystemSteam.SteamNetDriver]
-NetConnectionClassName="OnlineSubsystemSteam.SteamNetConnection"
-
-[/Script/Engine.UserInterfaceSettings]
-UIScaleCurve=(EditorCurveData=(Keys=((Time=480.000000,Value=0.444000),(Time=720.000000,Value=0.666000),(Time=1080.000000,Value=1.000000),(Time=8640.000000,Value=2.500000)),DefaultValue=340282346638528859811704183484516925440.000000,PreInfinityExtrap=RCCE_Constant,PostInfinityExtrap=RCCE_Constant),ExternalCurve=None)
-

Config/DefaultInput.ini

@@ -92,9 +92,7 @@ bCaptureMouseOnLaunch=True
 bEnableLegacyInputScales=True
 bEnableMotionControls=True
 bFilterInputByPlatformUser=False
-bEnableInputDeviceSubsystem=True
 bShouldFlushPressedKeysOnViewportFocusLost=True
-bEnableDynamicComponentInputBinding=True
 bAlwaysShowTouchInterface=False
 bShowConsoleOnFourFingerTap=True
 bEnableGestureRecognizer=False
@@ -103,18 +101,6 @@ DefaultViewportMouseCaptureMode=CapturePermanently_IncludingInitialMouseDown
 DefaultViewportMouseLockMode=LockOnCapture
 FOVScale=0.011110
 DoubleClickTime=0.200000
-+ActionMappings=(ActionName="Jump",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=SpaceBar)
-+ActionMappings=(ActionName="Crouch",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=LeftControl)
-+ActionMappings=(ActionName="Sprint",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=LeftShift)
-+ActionMappings=(ActionName="Use Left Weapon",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=LeftMouseButton)
-+ActionMappings=(ActionName="Use Right Weapon",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=RightMouseButton)
-+ActionMappings=(ActionName="Ability1",bShift=False,bCtrl=False,bAlt=True,bCmd=False,Key=One)
-+AxisMappings=(AxisName="MoveForward",Scale=1.000000,Key=W)
-+AxisMappings=(AxisName="MoveForward",Scale=-1.000000,Key=S)
-+AxisMappings=(AxisName="MoveRight",Scale=1.000000,Key=D)
-+AxisMappings=(AxisName="MoveRight",Scale=-1.000000,Key=A)
-+AxisMappings=(AxisName="Turn",Scale=1.000000,Key=MouseX)
-+AxisMappings=(AxisName="LookUp",Scale=-1.000000,Key=MouseY)
 DefaultPlayerInputClass=/Script/EnhancedInput.EnhancedPlayerInput
 DefaultInputComponentClass=/Script/EnhancedInput.EnhancedInputComponent
 DefaultTouchInterface=/Game/FirstPerson/Input/MobileControls.MobileControls

Monolith.uproject

@@ -17,52 +17,6 @@
 			"TargetAllowList": [
 				"Editor"
 			]
-		},
-		{
-			"Name": "WorldPartitionHLODUtilities",
-			"Enabled": true
-		},
-		{
-			"Name": "OnlineSubsystemSteam",
-			"Enabled": true
-		},
-		{
-			"Name": "SteamSockets",
-			"Enabled": true
-		},
-		{
-			"Name": "OnlineSubsystemGooglePlay",
-			"Enabled": false,
-			"SupportedTargetPlatforms": [
-				"Android"
-			]
-		},
-		{
-			"Name": "OnlineSubsystemIOS",
-			"Enabled": false,
-			"SupportedTargetPlatforms": [
-				"IOS",
-				"TVOS"
-			]
-		},
-		{
-			"Name": "OnlineSubsystemNull",
-			"Enabled": true
-		},
-		{
-			"Name": "OnlineFramework",
-			"Enabled": true
-		},
-		{
-			"Name": "OnlineServicesNull",
-			"Enabled": true
-		},
-		{
-			"Name": "OnlineServicesOSSAdapter",
-			"Enabled": true
 		}
-	],
-	"TargetPlatforms": [
-		"Windows"
 	]
 }

Plugins/AdvancedSessions/AdvancedSessions.uplugin

@@ -1,34 +0,0 @@
-{
-	"FileVersion": 3,
-	"FriendlyName": "Advanced Sessions",
-	"Version": 5.4,
-	"VersionName": "5.4",
-	"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",
-			"Enabled": true
-		},
-		{
-			"Name": "OnlineSubsystemUtils",
-			"Enabled": true
-		}
-	],
-	"DocsURL": "",
-	"MarketplaceURL": "",
-	"SupportURL": "",
-	"CanContainContent": false,
-	"IsBetaVersion": false,
-	"IsExperimentalVersion": false,
-	"Installed": false
-}

Plugins/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

Plugins/AdvancedSessions/Source/AdvancedSessions/AdvancedSessions.Build.cs

@@ -1,17 +0,0 @@
-using UnrealBuildTool;
-using System.IO;
- 
-public class AdvancedSessions : ModuleRules
-{
-    public AdvancedSessions(ReadOnlyTargetRules Target) : base(Target)
-    {
-        PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
-        //bEnforceIWYU = true;
-
-        PublicDefinitions.Add("WITH_ADVANCED_SESSIONS=1");
-
-       // 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"*/ });
-    }
-}

Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedExternalUILibrary.h

@@ -1,63 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-#pragma once
-#include "CoreMinimal.h"
-#include "BlueprintDataDefinitions.h"
-#include "Kismet/BlueprintFunctionLibrary.h"
-#include "Online.h"
-#include "Engine/LocalPlayer.h"
-#include "OnlineSubsystem.h"
-#include "BlueprintDataDefinitions.h"
-//#include "OnlineFriendsInterface.h"
-//#include "OnlineUserInterface.h"
-//#include "OnlineMessageInterface.h"
-//#include "OnlinePresenceInterface.h"
-//#include "Engine/GameInstance.h"
-#include "Interfaces/OnlineSessionInterface.h"
-
-//#include "UObjectIterator.h"
-
-#include "AdvancedExternalUILibrary.generated.h"
-
-
-//General Advanced Sessions Log
-DECLARE_LOG_CATEGORY_EXTERN(AdvancedExternalUILog, Log, All);
-
-UCLASS()
-class UAdvancedExternalUILibrary : public UBlueprintFunctionLibrary
-{
-	GENERATED_BODY()
-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);
-
-	// 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);
-
-	// 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);
-
-	// 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);
-
-	// Show the UI that shows a web URL
-	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedExternalUI", meta = (WorldContext = "WorldContextObject"))
-	static void CloseWebURLUI(UObject* WorldContextObject);
-
-
-	// 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);
-
-	// 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);
-
-};	

Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsGameInstance.h

@@ -1,145 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-#pragma once
-#include "CoreMinimal.h"
-#include "Engine/Engine.h"
-#include "BlueprintDataDefinitions.h"
-#include "Kismet/BlueprintFunctionLibrary.h"
-#include "Online.h"
-#include "OnlineSubsystem.h"
-#include "Interfaces/OnlineFriendsInterface.h"
-#include "Interfaces/OnlineUserInterface.h"
-#include "Interfaces/OnlineMessageInterface.h"
-#include "Interfaces/OnlinePresenceInterface.h"
-#include "Engine/GameInstance.h"
-#include "Engine/LocalPlayer.h"
-#include "Interfaces/OnlineSessionInterface.h"
-#include "OnlineSessionSettings.h"
-#include "UObject/UObjectIterator.h"
-#include "AdvancedFriendsInterface.h"
-
-#include "AdvancedFriendsGameInstance.generated.h"
-
-
-//General Advanced Sessions Log
-DECLARE_LOG_CATEGORY_EXTERN(AdvancedFriendsInterfaceLog, Log, All);
-
-UCLASS()
-class ADVANCEDSESSIONS_API UAdvancedFriendsGameInstance : public UGameInstance
-{
-	GENERATED_BODY()
-public:
-
-	UAdvancedFriendsGameInstance(const FObjectInitializer& ObjectInitializer);
-
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = AdvancedFriendsInterface)
-	bool bCallFriendInterfaceEventsOnPlayerControllers;
-
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = AdvancedFriendsInterface)
-	bool bCallIdentityInterfaceEventsOnPlayerControllers;
-
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = AdvancedFriendsInterface)
-	bool bCallVoiceInterfaceEventsOnPlayerControllers;
-
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = AdvancedVoiceInterface)
-	bool bEnableTalkingStatusDelegate;
-
-	//virtual void PostLoad() override;
-	virtual void Shutdown() override;
-	virtual void Init() override;
-
-	//*** Session invite received by local ***//
-	FOnSessionInviteReceivedDelegate SessionInviteReceivedDelegate;
-	FDelegateHandle SessionInviteReceivedDelegateHandle;
-
-	//const FUniqueNetId& /*UserId*/, const FUniqueNetId& /*FromId*/, const FString& /*AppId*/, const FOnlineSessionSearchResult& /*InviteResult*/
-	void OnSessionInviteReceivedMaster(const FUniqueNetId & PersonInvited, const FUniqueNetId & PersonInviting, const FString & AppId, const FOnlineSessionSearchResult& SessionToJoin);
-
-	// After a session invite has been accepted by the local player this event is triggered, call JoinSession on the session result to join it
-	UFUNCTION(BlueprintImplementableEvent, Category = "AdvancedFriends")
-	void OnSessionInviteReceived(int32 LocalPlayerNum, FBPUniqueNetId PersonInviting, const FString& AppId, const FBlueprintSessionResult& SessionToJoin);
-
-	//*** Session invite accepted by local ***//
-	FOnSessionUserInviteAcceptedDelegate SessionInviteAcceptedDelegate;
-	FDelegateHandle SessionInviteAcceptedDelegateHandle;
-
-	void OnSessionInviteAcceptedMaster(const bool bWasSuccessful, int32 LocalPlayer, TSharedPtr<const FUniqueNetId> PersonInviting, const FOnlineSessionSearchResult& SessionToJoin);
-
-	// After a session invite has been accepted by the local player this event is triggered, call JoinSession on the session result to join it
-	// This function is currently not hooked up in any of Epics default subsystems, it is here for custom subsystems
-	UFUNCTION(BlueprintImplementableEvent, Category = "AdvancedFriends")
-	void OnSessionInviteAccepted(int32 LocalPlayerNum, FBPUniqueNetId PersonInvited, const FBlueprintSessionResult& SessionToJoin);
-
-
-	// After a voice status has changed this event is triggered if the bEnableTalkingStatusDelegate property is true
-	UFUNCTION(BlueprintImplementableEvent, Category = "AdvancedVoice")
-	void OnPlayerTalkingStateChanged(FBPUniqueNetId PlayerId, bool bIsTalking);
-
-	void OnPlayerTalkingStateChangedMaster(TSharedRef<const FUniqueNetId> PlayerId, bool bIsTalking);
-
-	FOnPlayerTalkingStateChangedDelegate PlayerTalkingStateChangedDelegate;
-	FDelegateHandle PlayerTalkingStateChangedDelegateHandle;
-
-
-	// Called when the designated LocalUser has changed login state
-	UFUNCTION(BlueprintImplementableEvent , Category = "AdvancedIdentity", meta = (DisplayName = "OnPlayerLoginChanged"))
-	void OnPlayerLoginChanged(int32 PlayerNum);
-
-	void OnPlayerLoginChangedMaster(int32 PlayerNum);
-	FOnLoginChangedDelegate PlayerLoginChangedDelegate;
-	FDelegateHandle PlayerLoginChangedDelegateHandle;
-
-	// Called when the designated LocalUser has changed login status
-	UFUNCTION(BlueprintImplementableEvent, Category = "AdvancedIdentity", meta = (DisplayName = "OnPlayerLoginStatusChanged"))
-	void OnPlayerLoginStatusChanged(int32 PlayerNum, EBPLoginStatus PreviousStatus, EBPLoginStatus NewStatus, FBPUniqueNetId NewPlayerUniqueNetID);
-
-	void OnPlayerLoginStatusChangedMaster(int32 PlayerNum, ELoginStatus::Type PreviousStatus, ELoginStatus::Type NewStatus, const FUniqueNetId & NewPlayerUniqueNetID);
-	FOnLoginStatusChangedDelegate PlayerLoginStatusChangedDelegate;
-	FDelegateHandle PlayerLoginStatusChangedDelegateHandle;
-
-
-	//*** Session Invite Received From Friend ***//
-	// REMOVED BECAUSE IT NEVER GETS CALLED
-	/*FOnSessionInviteReceivedDelegate SessionInviteReceivedDelegate;
-	FDelegateHandle SessionInviteReceivedDelegateHandle;
-
-	void OnSessionInviteReceivedMaster(const FUniqueNetId &InvitedPlayer, const FUniqueNetId &FriendInviting, const FOnlineSessionSearchResult& Session);
-
-	// After a session invite has been sent from a friend this event is triggered, call JoinSession on the session result to join it
-	UFUNCTION(BlueprintImplementableEvent, Category = "AdvancedFriends")
-	void OnSessionInviteReceived(const FBPUniqueNetId &InvitedPlayer, const FBPUniqueNetId &FriendInviting, const FBlueprintSessionResult &Session);
-	*/
-
-	//*** Friend Invite Accepted ***//
-	/*FOnInviteAcceptedDelegate FriendInviteAcceptedDelegate;
-	FDelegateHandle FriendInviteAcceptedDelegateHandle;
-
-	void OnFriendInviteAcceptedDelegateMaster(const FUniqueNetId& LocalPlayer, const FUniqueNetId &PlayerInvited);
-
-	// After a session invite has been accepted by a friend this event is triggered
-	UFUNCTION(BlueprintImplementableEvent, Category = "AdvancedFriends")
-	void OnFriendInviteAccepted(const FBPUniqueNetId &InvitedPlayer, const FBPUniqueNetId &PlayerInvited);
-	*/
-
-	//*** Friend Invite Rejected ***//
-	/*FOnInviteRejectedDelegate SessionInviteRejectedByFriendDelegate;
-	FDelegateHandle InviteRejectedByFriendDelegateHandle;
-
-	void OnFriendInviteRejectedDelegateMaster(const FUniqueNetId& LocalPlayer, const FUniqueNetId &PlayerDeclined);
-
-	// After a friend invite has been rejected this event is triggered
-	UFUNCTION(BlueprintImplementableEvent, Category = "AdvancedFriends")
-	void OnFriendInviteRejected(const FBPUniqueNetId &InvitedPlayer, const FBPUniqueNetId &PlayerDeclined);
-	*/
-
-	//*** Removed By Friend ***//
-	/*FOnFriendRemovedDelegate RemovedByFriendDelegate;
-	FDelegateHandle RemovedByFriendDelegateHandle;
-
-	void OnRemovedByFriendDelegateMaster(const FUniqueNetId& LocalPlayer, const FUniqueNetId &FriendRemoved);
-
-	// After a friend removed the player this event is triggered
-	UFUNCTION(BlueprintImplementableEvent, Category = "AdvancedFriends")
-	void OnRemovedByFriend(const FBPUniqueNetId &InvitedPlayer, const FBPUniqueNetId &FriendRemoved);*/
-};
-

Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsInterface.h

@@ -1,56 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-#pragma once
-#include "CoreMinimal.h"
-#include "Kismet/BlueprintFunctionLibrary.h"
-#include "Online.h"
-#include "OnlineSubsystem.h"
-#include "Interfaces/OnlineFriendsInterface.h"
-#include "Interfaces/OnlineUserInterface.h"
-#include "Interfaces/OnlineMessageInterface.h"
-#include "Interfaces/OnlinePresenceInterface.h"
-#include "Engine/GameInstance.h"
-#include "Interfaces/OnlineSessionInterface.h"
-#include "OnlineSessionSettings.h"
-#include "UObject/UObjectIterator.h"
-#include "BlueprintDataDefinitions.h"
-#include "AdvancedFriendsInterface.generated.h"
-
-
-UINTERFACE(MinimalAPI)
-class UAdvancedFriendsInterface : public UInterface
-{
-	GENERATED_UINTERFACE_BODY()
-};
-
-class IAdvancedFriendsInterface
-{
-	GENERATED_IINTERFACE_BODY()
-public:
-	
-	// Called when the designated LocalUser has accepted a session invite, use JoinSession on result to connect
-	UFUNCTION(BlueprintImplementableEvent, meta = (DisplayName = "OnSessionInviteReceived"))
-	void OnSessionInviteReceived(FBPUniqueNetId PersonInviting, const FBlueprintSessionResult& SearchResult);
-
-	// Called when the designated LocalUser has accepted a session invite, use JoinSession on result to connect
-	UFUNCTION(BlueprintImplementableEvent, meta = (DisplayName = "OnSessionInviteAccepted"))
-	void OnSessionInviteAccepted(FBPUniqueNetId PersonInvited, const FBlueprintSessionResult& SearchResult);
-
-	// Called when the designated LocalUser has accepted a session invite, use JoinSession on result to connect
-	UFUNCTION(BlueprintImplementableEvent, meta = (DisplayName = "OnPlayerVoiceStateChanged"))
-	void OnPlayerVoiceStateChanged(FBPUniqueNetId PlayerId, bool bIsTalking);
-
-	// Called when the designated LocalUser has changed login state
-	UFUNCTION(BlueprintImplementableEvent, meta = (DisplayName = "OnPlayerLoginChanged"))
-	void OnPlayerLoginChanged(int32 PlayerNum);
-
-	// Called when the designated LocalUser has changed login state
-	UFUNCTION(BlueprintImplementableEvent, meta = (DisplayName = "OnPlayerLoginStatusChanged"))
-	void OnPlayerLoginStatusChanged(EBPLoginStatus PreviousStatus, EBPLoginStatus NewStatus, FBPUniqueNetId PlayerUniqueNetID);
-
-	// REMOVED BECAUSE IT WAS NEVER BEING CALLED
-	// Called when the designated LocalUser has received a session invite, use JoinSession on result to connect
-	//UFUNCTION(BlueprintImplementableEvent, meta = (FriendlyName = "OnSessionInviteReceived"))
-	//void OnSessionInviteReceived(const FBPUniqueNetId &FriendInviting, const FBlueprintSessionResult &Session);
-
-};	

Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsLibrary.h

@@ -1,56 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-#pragma once
-#include "CoreMinimal.h"
-#include "BlueprintDataDefinitions.h"
-#include "Kismet/BlueprintFunctionLibrary.h"
-#include "Online.h"
-#include "Engine/LocalPlayer.h"
-#include "OnlineSubsystem.h"
-#include "Interfaces/OnlineFriendsInterface.h"
-#include "Interfaces/OnlineUserInterface.h"
-#include "Interfaces/OnlineMessageInterface.h"
-#include "Interfaces/OnlinePresenceInterface.h"
-#include "Engine/GameInstance.h"
-#include "Interfaces/OnlineSessionInterface.h"
-
-#include "UObject/UObjectIterator.h"
-
-#include "AdvancedFriendsLibrary.generated.h"
-
-
-//General Advanced Sessions Log
-DECLARE_LOG_CATEGORY_EXTERN(AdvancedFriendsLog, Log, All);
-
-UCLASS()
-class UAdvancedFriendsLibrary : public UBlueprintFunctionLibrary
-{
-	GENERATED_BODY()
-public:
-	
-	//********* Friend List Functions *************//
-
-	// Sends an Invite to the current online session to a list of friends
-	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedFriends|FriendsList", meta = (ExpandEnumAsExecs = "Result"))
-	static void SendSessionInviteToFriends(APlayerController *PlayerController, const TArray<FBPUniqueNetId> &Friends, EBlueprintResultSwitch &Result);
-
-	// Sends an Invite to the current online session to a friend
-	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedFriends|FriendsList", meta = (ExpandEnumAsExecs = "Result"))
-	static void SendSessionInviteToFriend(APlayerController *PlayerController, const FBPUniqueNetId &FriendUniqueNetId, EBlueprintResultSwitch &Result);
-
-	// Get a friend from the previously read/saved friends list (Must Call GetFriends first for this to return anything)
-	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedFriends|FriendsList")
-	static void GetFriend(APlayerController *PlayerController, const FBPUniqueNetId FriendUniqueNetId, FBPFriendInfo &Friend);
-
-	// Get the previously read/saved friends list (Must Call GetFriends first for this to return anything)
-	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedFriends|FriendsList")
-	static void GetStoredFriendsList(APlayerController *PlayerController, TArray<FBPFriendInfo> &FriendsList);
-
-	// Get the previously read/saved recent players list (Must Call GetRecentPlayers first for this to return anything)
-	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedFriends|RecentPlayersList")
-	static void GetStoredRecentPlayersList(FBPUniqueNetId UniqueNetId, TArray<FBPOnlineRecentPlayer> &PlayersList);
-
-	// Check if a UniqueNetId is a friend
-	UFUNCTION(BlueprintPure, Category = "Online|AdvancedFriends|FriendsList")
-	static void IsAFriend(APlayerController *PlayerController, const FBPUniqueNetId UniqueNetId, bool &IsFriend);
-};	

Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedGameSession.h

@@ -1,71 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-#pragma once
-#include "CoreMinimal.h"
-#include "Engine/Engine.h"
-#include "Online.h"
-#include "OnlineSubsystem.h"
-#include "Engine/GameInstance.h"
-#include "GameFramework/GameModeBase.h"
-#include "GameFramework/GameSession.h"
-#include "GameFramework/PlayerState.h"
-
-//#include "UObjectIterator.h"
-
-#include "AdvancedGameSession.generated.h"
-
-
-
-
-/**
- A quick wrapper around the game session to add a partial ban implementation. Just bans for the duration of the current session
-*/
-UCLASS(config = Game, notplaceable)
-class AAdvancedGameSession : public AGameSession
-{
-	GENERATED_UCLASS_BODY()
-
-public:
-
-	UPROPERTY(Transient)
-	TMap<FUniqueNetIdRepl, FText> BanList;
-
-	virtual bool BanPlayer(class APlayerController* BannedPlayer, const FText& BanReason)
-	{
-
-		if (APlayerState* PlayerState = (BannedPlayer != NULL) ? BannedPlayer->PlayerState : NULL)
-		{
-			FUniqueNetIdRepl UniqueNetID = PlayerState->GetUniqueId();
-			bool bWasKicked = KickPlayer(BannedPlayer, BanReason);
-
-			if (bWasKicked)
-			{
-				BanList.Add(UniqueNetID, BanReason);
-			}
-
-			return bWasKicked;
-		}
-		
-		return false;
-	}
-
-	// This should really be handled in the game mode asking game session, but I didn't want to force a custom game session AND game mode
-	// If done in the game mode, we could check prior to actually spooling up any player information in ApproveLogin
-	virtual void PostLogin(APlayerController* NewPlayer) override
-	{
-		if (APlayerState* PlayerState = (NewPlayer != NULL) ? NewPlayer->PlayerState : NULL)
-		{
-			FUniqueNetIdRepl UniqueNetID = PlayerState->GetUniqueId();
-
-			if (BanList.Contains(UniqueNetID))
-			{
-				KickPlayer(NewPlayer, BanList[UniqueNetID]);
-			}
-		}
-	}
-};
-
-AAdvancedGameSession::AAdvancedGameSession(const FObjectInitializer& ObjectInitializer)
-	: Super(ObjectInitializer)
-{
-}

Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedIdentityLibrary.h

@@ -1,81 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-#pragma once
-#include "CoreMinimal.h"
-#include "BlueprintDataDefinitions.h"
-#include "Kismet/BlueprintFunctionLibrary.h"
-#include "Online.h"
-#include "OnlineSubsystem.h"
-#include "Interfaces/OnlineIdentityInterface.h"
-#include "Interfaces/OnlineUserInterface.h"
-#include "Interfaces/OnlinePresenceInterface.h"
-#include "Engine/GameInstance.h"
-#include "Engine/LocalPlayer.h"
-
-#include "UObject/UObjectIterator.h"
-
-#include "AdvancedIdentityLibrary.generated.h"
-
-
-//General Advanced Sessions Log
-DECLARE_LOG_CATEGORY_EXTERN(AdvancedIdentityLog, Log, All);
-
-UCLASS()
-class UAdvancedIdentityLibrary : public UBlueprintFunctionLibrary
-{
-	GENERATED_BODY()
-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);
-
-	// 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);
-
-	// Get a players nickname
-	UFUNCTION(BlueprintPure, Category = "Online|AdvancedIdentity", meta = (WorldContext = "WorldContextObject"))
-	static void GetPlayerNickname(UObject* WorldContextObject, 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);
-
-	// 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);
-
-	// Get a user account access token
-	UFUNCTION(BlueprintPure, Category = "Online|AdvancedIdentity|UserAccount")
-	static void GetUserAccountAccessToken(const FBPUserOnlineAccount & AccountInfo, FString & AccessToken);
-
-	// Get a user account Auth attribute (depends on subsystem)
-	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedIdentity|UserAccount", meta = (ExpandEnumAsExecs = "Result"))
-	static void GetUserAccountAuthAttribute(const FBPUserOnlineAccount & AccountInfo, const FString & AttributeName, FString & AuthAttribute, EBlueprintResultSwitch &Result);
-
-	// Set a user account attribute (depends on subsystem)
-	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedIdentity|UserAccount", meta = (ExpandEnumAsExecs = "Result"))
-	static void SetUserAccountAttribute(const FBPUserOnlineAccount & AccountInfo, const FString & AttributeName, const FString & NewAttributeValue, EBlueprintResultSwitch &Result);
-
-	// Get user ID
-	UFUNCTION(BlueprintPure, Category = "Online|AdvancedIdentity|UserAccount")
-	static void GetUserID(const FBPUserOnlineAccount & AccountInfo, FBPUniqueNetId & UniqueNetID);
-
-	// Get user accounts real name if possible
-	UFUNCTION(BlueprintPure, Category = "Online|AdvancedIdentity|UserAccount")
-	static void GetUserAccountRealName(const FBPUserOnlineAccount & AccountInfo, FString & UserName);
-
-	// Get user account display name if possible
-	UFUNCTION(BlueprintPure, Category = "Online|AdvancedIdentity|UserAccount")
-	static void GetUserAccountDisplayName(const FBPUserOnlineAccount & AccountInfo, FString & DisplayName);
-
-	// Get user account attribute (depends on subsystem)
-	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedIdentity|UserAccount", meta = (ExpandEnumAsExecs = "Result"))
-	static void GetUserAccountAttribute(const FBPUserOnlineAccount & AccountInfo, const FString & AttributeName, FString & AttributeValue, EBlueprintResultSwitch &Result);
-
-
-};	

Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedSessions.h

@@ -1,11 +0,0 @@
-#pragma once
- 
-#include "Modules/ModuleManager.h"
-
-class AdvancedSessions : public IModuleInterface
-{
-public:
-	/** IModuleInterface implementation */
-	void StartupModule();
-	void ShutdownModule();
-};

Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedSessionsLibrary.h

@@ -1,213 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-#pragma once
-#include "CoreMinimal.h"
-#include "Engine/Engine.h"
-#include "BlueprintDataDefinitions.h"
-#include "Kismet/BlueprintFunctionLibrary.h"
-#include "Online.h"
-#include "OnlineSubsystem.h"
-#include "Interfaces/OnlineFriendsInterface.h"
-#include "Interfaces/OnlineUserInterface.h"
-#include "Interfaces/OnlineMessageInterface.h"
-#include "Interfaces/OnlinePresenceInterface.h"
-#include "Engine/GameInstance.h"
-#include "Interfaces/OnlineSessionInterface.h"
-
-#include "GameFramework/GameModeBase.h"
-#include "GameFramework/GameSession.h"
-
-//#include "UObjectIterator.h"
-
-#include "AdvancedSessionsLibrary.generated.h"
-
-
-//General Advanced Sessions Log
-DECLARE_LOG_CATEGORY_EXTERN(AdvancedSessionsLog, Log, All);
-
-
-UCLASS()
-class UAdvancedSessionsLibrary : public UBlueprintFunctionLibrary
-{
-	GENERATED_BODY()
-public:
-		//********* Session Admin Functions *************//	
-
-		// Kick a player from the currently active game session, only available on the server
-		UFUNCTION(BlueprintCallable, Category = "Online|AdvancedSessions", meta = (WorldContext = "WorldContextObject"))
-		static bool KickPlayer(UObject* WorldContextObject, APlayerController* PlayerToKick, FText KickReason);
-
-		// Ban a player from the currently active game session, only available on the server
-		// Note that the default gamesession class does not implement an actual ban list and just kicks when this is called
-		UFUNCTION(BlueprintCallable, Category = "Online|AdvancedSessions", meta = (WorldContext = "WorldContextObject"))
-		static bool BanPlayer(UObject* WorldContextObject, APlayerController* PlayerToBan, FText BanReason);
-
-		//********* Session Search Functions *************//	
-
-		// Adds or modifies session settings in an existing array depending on if they exist already or not
-		UFUNCTION(BlueprintCallable, Category = "Online|AdvancedSessions|SessionInfo")
-		static void AddOrModifyExtraSettings(UPARAM(ref)  TArray<FSessionPropertyKeyPair> & SettingsArray, UPARAM(ref)  TArray<FSessionPropertyKeyPair> & NewOrChangedSettings, TArray<FSessionPropertyKeyPair> & ModifiedSettingsArray);
-
-		// Get an array of the session settings from a session search result
-		UFUNCTION(BlueprintCallable, Category = "Online|AdvancedSessions|SessionInfo")
-		static void GetExtraSettings(FBlueprintSessionResult SessionResult, TArray<FSessionPropertyKeyPair> & ExtraSettings);
-
-		// Get the current session state
-		UFUNCTION(BlueprintCallable, Category = "Online|AdvancedSessions|SessionInfo", meta = (WorldContext = "WorldContextObject"))
-		static void GetSessionState(UObject* WorldContextObject, EBPOnlineSessionState &SessionState);
-
-		// Get the current session settings
-		UFUNCTION(BlueprintCallable, Category = "Online|AdvancedSessions|SessionInfo", meta = (ExpandEnumAsExecs = "Result", WorldContext = "WorldContextObject"))
-		static void GetSessionSettings(UObject* WorldContextObject, int32 &NumConnections, int32 &NumPrivateConnections, bool &bIsLAN, bool &bIsDedicated, bool &bAllowInvites, bool &bAllowJoinInProgress, bool &bIsAnticheatEnabled, int32 &BuildUniqueID, TArray<FSessionPropertyKeyPair> &ExtraSettings, EBlueprintResultSwitch &Result);
-
-		// Check if someone is in the current session
-		UFUNCTION(BlueprintCallable, Category = "Online|AdvancedSessions|SessionInfo", meta = (WorldContext = "WorldContextObject"))
-		static void IsPlayerInSession(UObject* WorldContextObject, const FBPUniqueNetId &PlayerToCheck, bool &bIsInSession);
-		
-		// Make a literal session search parameter
-		UFUNCTION(BlueprintPure, Category = "Online|AdvancedSessions|SessionInfo|Literals")
-		static FSessionsSearchSetting MakeLiteralSessionSearchProperty(FSessionPropertyKeyPair SessionSearchProperty, EOnlineComparisonOpRedux ComparisonOp);
-
-
-		//********* Session Information Functions ***********//
-
-		// Check if a session result is valid or not
-		UFUNCTION(BlueprintPure, Category = "Online|AdvancedSessions|SessionInfo")
-		static bool IsValidSession(const FBlueprintSessionResult & SessionResult);
-
-		// Get a string copy of a session ID
-		UFUNCTION(BlueprintPure, Category = "Online|AdvancedSessions|SessionInfo")
-		static void GetSessionID_AsString(const FBlueprintSessionResult & SessionResult, FString& SessionID);
-
-		// Get a string copy of the current session ID
-		UFUNCTION(BlueprintPure, Category = "Online|AdvancedSessions|SessionInfo", meta = (WorldContext = "WorldContextObject"))
-		static void GetCurrentSessionID_AsString(UObject* WorldContextObject, FString& SessionID);
-
-		// Get the Unique Current Build ID
-		UFUNCTION(BlueprintPure, Category = "Online|AdvancedSessions|SessionInfo")
-		static void GetCurrentUniqueBuildID(int32 &UniqueBuildId);
-		
-		// Get the Unique Build ID from a session search result
-		UFUNCTION(BlueprintPure, Category = "Online|AdvancedSessions|SessionInfo")
-		static void GetUniqueBuildID(FBlueprintSessionResult SessionResult, int32 &UniqueBuildId);
-		
-		
-		// Thanks CriErr for submission
-
-
-		// Get session property Key Name value
-		UFUNCTION(BlueprintCallable, Category = "Online|AdvancedSessions|SessionInfo")
-		static FName GetSessionPropertyKey(const FSessionPropertyKeyPair& SessionProperty);
-		
-		// Find session property by Name
-		UFUNCTION(BlueprintCallable, Category = "Online|AdvancedSessions|SessionInfo", meta = (ExpandEnumAsExecs = "Result"))
-		static void FindSessionPropertyByName(const TArray<FSessionPropertyKeyPair>& ExtraSettings, FName SettingsName, EBlueprintResultSwitch &Result, FSessionPropertyKeyPair& OutProperty);
-		
-		// Find session property index by Name
-		UFUNCTION(BlueprintCallable, Category = "Online|AdvancedSessions|SessionInfo", meta = (ExpandEnumAsExecs = "Result"))
-		static void FindSessionPropertyIndexByName(const TArray<FSessionPropertyKeyPair>& ExtraSettings, FName SettingName, EBlueprintResultSwitch &Result, int32& OutIndex);
-
-		/// Removed the Index_None part of the last function, that isn't accessible in blueprint, better to return success/failure
-		// End Thanks CriErr :p
-
-		// Get session custom information key/value as Byte (For Enums)
-		UFUNCTION(BlueprintCallable, Category = "Online|AdvancedSessions|SessionInfo", meta = (ExpandEnumAsExecs = "SearchResult"))
-		static void GetSessionPropertyByte(const TArray<FSessionPropertyKeyPair> & ExtraSettings, FName SettingName, ESessionSettingSearchResult &SearchResult, uint8 &SettingValue);
-
-		// Get session custom information key/value as Bool
-		// Steam only currently supports Int,Float,String,BYTE values for search filtering!!!
-		UFUNCTION(BlueprintCallable, Category = "Online|AdvancedSessions|SessionInfo", meta = (ExpandEnumAsExecs = "SearchResult"))
-		static void GetSessionPropertyBool(const TArray<FSessionPropertyKeyPair> & ExtraSettings, FName SettingName, ESessionSettingSearchResult &SearchResult, bool &SettingValue);
-
-		// Get session custom information key/value as String
-		UFUNCTION(BlueprintCallable, Category = "Online|AdvancedSessions|SessionInfo", meta = (ExpandEnumAsExecs = "SearchResult"))
-		static void GetSessionPropertyString(const TArray<FSessionPropertyKeyPair> & ExtraSettings, FName SettingName, ESessionSettingSearchResult &SearchResult, FString &SettingValue);
-
-		// Get session custom information key/value as Int
-		UFUNCTION(BlueprintCallable, Category = "Online|AdvancedSessions|SessionInfo", meta = (ExpandEnumAsExecs = "SearchResult"))
-		static void GetSessionPropertyInt(const TArray<FSessionPropertyKeyPair> & ExtraSettings, FName SettingName, ESessionSettingSearchResult &SearchResult, int32 &SettingValue);
-
-		// Get session custom information key/value as Float
-		UFUNCTION(BlueprintCallable, Category = "Online|AdvancedSessions|SessionInfo", meta = (ExpandEnumAsExecs = "SearchResult"))
-		static void GetSessionPropertyFloat(const TArray<FSessionPropertyKeyPair> & ExtraSettings, FName SettingName, ESessionSettingSearchResult &SearchResult, float &SettingValue);
-
-
-		// Make a literal session custom information key/value pair from Byte (For Enums)
-		UFUNCTION(BlueprintPure, Category = "Online|AdvancedSessions|SessionInfo|Literals")
-		static FSessionPropertyKeyPair MakeLiteralSessionPropertyByte(FName Key, uint8 Value);
-
-		// Make a literal session custom information key/value pair from Bool
-		// Steam only currently supports Int,Float,String,BYTE values for search filtering!
-		UFUNCTION(BlueprintPure, Category = "Online|AdvancedSessions|SessionInfo|Literals")
-		static FSessionPropertyKeyPair MakeLiteralSessionPropertyBool(FName Key, bool Value);
-
-		// Make a literal session custom information key/value pair from String
-		UFUNCTION(BlueprintPure, Category = "Online|AdvancedSessions|SessionInfo|Literals")
-		static FSessionPropertyKeyPair MakeLiteralSessionPropertyString(FName Key, FString Value);
-
-		// Make a literal session custom information key/value pair from Int
-		UFUNCTION(BlueprintPure, Category = "Online|AdvancedSessions|SessionInfo|Literals")
-		static FSessionPropertyKeyPair MakeLiteralSessionPropertyInt(FName Key, int32 Value);
-
-		// Make a literal session custom information key/value pair from Float
-		UFUNCTION(BlueprintPure, Category = "Online|AdvancedSessions|SessionInfo|Literals")
-		static FSessionPropertyKeyPair MakeLiteralSessionPropertyFloat(FName Key, float Value);
-
-
-		//******* Player ID functions *********//
-
-		// Get the unique net id of a network player attached to the given controller
-		UFUNCTION(BlueprintPure, Category = "Online|AdvancedSessions|PlayerInfo|PlayerID")
-		static void GetUniqueNetID(APlayerController *PlayerController, 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);
-		
-		// Return True if Unique Net ID is valid
-		UFUNCTION(BlueprintPure, Category = "Online|AdvancedSessions|PlayerInfo|PlayerID")
-		static bool IsValidUniqueNetID(const FBPUniqueNetId &UniqueNetId);
-
-		/* Returns true if the values are equal (A == B) */
-		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);
-
-		//******** Player Name Functions **********//
-
-		// Get the player name of a network player attached to the given controller
-		UFUNCTION(BlueprintPure, Category = "Online|AdvancedSessions|PlayerInfo|PlayerName")
-		static void GetPlayerName(APlayerController *PlayerController, FString &PlayerName);
-
-		// Set the player name of a network player attached to the given controller
-		UFUNCTION(BlueprintCallable, Category = "Online|AdvancedSessions|PlayerInfo|PlayerName")
-		static void SetPlayerName(APlayerController *PlayerController, FString PlayerName);
-
-		//********** Misc Player Info Functions *********//
-
-		// Get the number of network players
-		UFUNCTION(BlueprintPure, Category = "Online|AdvancedSessions|PlayerInfo|Misc", meta = (bIgnoreSelf = "true", WorldContext = "WorldContextObject", DisplayName = "GetNumNetworkPlayers"))
-		static void GetNumberOfNetworkPlayers(UObject* WorldContextObject, int32 &NumNetPlayers);
-
-		// Get the network player index of the given controller
-		UFUNCTION(BlueprintPure, Category = "Online|AdvancedSessions|PlayerInfo|Misc")
-		static void GetNetPlayerIndex(APlayerController *PlayerController, int32 &NetPlayerIndex);
-
-		// Checks if the stated session subsystem is active
-		UFUNCTION(BlueprintPure, Category = "Online|AdvancedSessions|Misc")
-		static bool HasOnlineSubsystem(FName SubSystemName);
-
-		//**** Seamless travel Functions ****//
-
-		//Exposes Server travel to blueprint
-		UFUNCTION(BlueprintCallable, BlueprintAuthorityOnly, Category = "Online|AdvancedSessions|Seamless", meta = (HidePin = "WorldContextObject", DefaultToSelf = "WorldContextObject"))
-		static bool ServerTravel(UObject* WorldContextObject, const FString& InURL, bool bAbsolute, bool bShouldSkipGameNotify);
-		
-};	

Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedVoiceLibrary.h

@@ -1,99 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-#pragma once
-#include "CoreMinimal.h"
-#include "Kismet/BlueprintFunctionLibrary.h"
-#include "BlueprintDataDefinitions.h"
-#include "Online.h"
-#include "OnlineSubsystem.h"
-#include "Interfaces/VoiceInterface.h"
-//#include "OnlineFriendsInterface.h"
-//#include "OnlineUserInterface.h"
-//#include "OnlineMessageInterface.h"
-//#include "OnlinePresenceInterface.h"
-#include "Engine/GameInstance.h"
-//#include "OnlineSessionInterface.h"
-
-#include "UObject/UObjectIterator.h"
-
-#include "AdvancedVoiceLibrary.generated.h"
-
-
-//General Advanced Sessions Log
-DECLARE_LOG_CATEGORY_EXTERN(AdvancedVoiceLog, Log, All);
-
-
-UCLASS()
-class UAdvancedVoiceLibrary : public UBlueprintFunctionLibrary
-{
-	GENERATED_BODY()
-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);
-
-	// 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);
-
-	// 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);
-
-	// 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);
-
-	// 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);
-
-	// UnRegisters local player as a local talker
-	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedVoice", meta = (WorldContext = "WorldContextObject"))
-	static void UnRegisterLocalTalker(UObject* WorldContextObject, uint8 LocalPlayerNum = 0);
-
-	// UnRegisters all signed in players as local talkers
-	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedVoice", meta = (WorldContext = "WorldContextObject"))
-	static void UnRegisterAllLocalTalkers(UObject* WorldContextObject);
-
-	// 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);
-
-	// UnRegisters a remote player as a talker
-	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedVoice", meta = (WorldContext = "WorldContextObject"))
-	static bool UnRegisterRemoteTalker(UObject* WorldContextObject, const FBPUniqueNetId& UniqueNetId);
-
-	// UnRegisters all remote players as talkers
-	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedVoice", meta = (WorldContext = "WorldContextObject"))
-	static void RemoveAllRemoteTalkers(UObject* WorldContextObject);
-
-	// Returns whether a local player is currently talking
-	UFUNCTION(BlueprintPure, Category = "Online|AdvancedVoice|VoiceInfo", meta = (WorldContext = "WorldContextObject"))
-	static bool IsLocalPlayerTalking(UObject* WorldContextObject, 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);
-
-	// 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);
-
-	// 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);
-
-	// 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);
-
-	// 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);
-};	

Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AutoLoginUserCallbackProxy.h

@@ -1,55 +0,0 @@
-// Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
-#pragma once
-
-#include "CoreMinimal.h"
-#include "BlueprintDataDefinitions.h"
-#include "Interfaces/OnlineIdentityInterface.h"
-#include "Engine/LocalPlayer.h"
-#include "AutoLoginUserCallbackProxy.generated.h"
-
-UCLASS(MinimalAPI)
-class UAutoLoginUserCallbackProxy : public UOnlineBlueprintCallProxyBase
-{
-	GENERATED_UCLASS_BODY()
-
-	// Called when there is a successful destroy
-	UPROPERTY(BlueprintAssignable)
-	FEmptyOnlineDelegate OnSuccess;
-
-	// Called when there is an unsuccessful destroy
-	UPROPERTY(BlueprintAssignable)
-	FEmptyOnlineDelegate OnFailure;
-
-	/**
-	 * Logs the player into the online service using parameters passed on the
-	 * command line. Expects -AUTH_LOGIN=<UserName> -AUTH_PASSWORD=<password>. If either
-	 * are missing, the function returns false and doesn't start the login
-	 * process
-	 *
-	 * @param LocalUserNum the controller number of the associated user
-	 *
-	 */
-	UFUNCTION(BlueprintCallable, meta=(BlueprintInternalUseOnly = "true", WorldContext="WorldContextObject"), Category = "Online|AdvancedIdentity")
-	static UAutoLoginUserCallbackProxy* AutoLoginUser(UObject* WorldContextObject, int32 LocalUserNum);
-
-	// UOnlineBlueprintCallProxyBase interface
-	virtual void Activate() override;
-	// End of UOnlineBlueprintCallProxyBase interface
-
-private:
-	// Internal callback when the operation completes, calls out to the public success/failure callbacks
-	void OnCompleted(int32 LocalUserNum, bool bWasSuccessful, const FUniqueNetId& UserId, const FString& ErrorVal);
-
-private:
-	// The controller number of the associated user
-	int32 LocalUserNumber;
-
-	// The delegate executed by the online subsystem
-	FOnLoginCompleteDelegate Delegate;
-
-	// Handle to the registered OnDestroySessionComplete delegate
-	FDelegateHandle DelegateHandle;
-
-	// The world context object in which this call is taking place
-	TWeakObjectPtr<UObject> WorldContextObject;
-};

Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/BlueprintDataDefinitions.h

@@ -1,435 +0,0 @@
-#pragma once
-#include "CoreMinimal.h"
-//#include "EngineMinimal.h"
-#include "Engine/Engine.h"
-#include "GameFramework/PlayerState.h"
-//#include "Core.h"
-#include "Interfaces/OnlineSessionInterface.h"
-#include "OnlineSessionSettings.h"
-#include "OnlineDelegateMacros.h"
-#include "OnlineSubsystem.h"
-#include "OnlineSubsystemImpl.h"
-#include "OnlineSubsystemUtils.h"
-#include "OnlineSubsystemUtilsModule.h"
-#include "GameFramework/PlayerController.h"
-#include "Modules/ModuleManager.h"
-#include "OnlineSubsystemUtilsClasses.h"
-#include "BlueprintDataDefinitions.generated.h"	
-
-UENUM(BlueprintType)
-enum class EBPUserPrivileges : uint8
-{
-	/** Whether the user can play at all, online or offline - may be age restricted */
-	CanPlay,
-	/** Whether the user can play in online modes */
-	CanPlayOnline,
-	/** Whether the user can use voice and text chat */
-	CanCommunicateOnline,
-	/** Whether the user can use content generated by other users */
-	CanUseUserGeneratedContent
-};
-
-
-UENUM(BlueprintType)
-enum class EBPLoginStatus : uint8
-{
-	/** Player has not logged in or chosen a local profile */
-	NotLoggedIn,
-	/** Player is using a local profile but is not logged in */
-	UsingLocalProfile,
-	/** Player has been validated by the platform specific authentication service */
-	LoggedIn
-};
-
-
-USTRUCT(BlueprintType)
-struct FBPUserOnlineAccount
-{
-	GENERATED_USTRUCT_BODY()
-
-public:
-	TSharedPtr<FUserOnlineAccount> UserAccountInfo;
-
-	FBPUserOnlineAccount()
-	{
-
-	}
-
-	FBPUserOnlineAccount(TSharedPtr<FUserOnlineAccount> UserAccount)
-	{
-		UserAccountInfo = UserAccount;
-	}
-};
-
-UENUM()
-enum class ESessionSettingSearchResult : uint8
-{
-	// Found the setting
-	Found,
-
-	// Did not find the setting
-	NotFound,
-
-	// Was not the correct type
-	WrongType
-};
-
-// This makes a lot of the blueprint functions cleaner
-UENUM()
-enum class EBlueprintResultSwitch : uint8
-{
-	// On Success
-	OnSuccess,
-
-	// On Failure
-	OnFailure
-};
-
-// This makes a lot of the blueprint functions cleaner
-UENUM()
-enum class EBlueprintAsyncResultSwitch : uint8
-{
-	// On Success
-	OnSuccess,
-
-	// Still loading
-	AsyncLoading,
-	// On Failure
-	OnFailure
-};
-
-// This is to define server type searches
-UENUM(BlueprintType)
-enum class EBPServerPresenceSearchType : uint8
-{
-	AllServers,
-	ClientServersOnly,
-	DedicatedServersOnly
-};
-
-// Wanted this to be switchable in the editor
-UENUM(BlueprintType)
-enum class EBPOnlinePresenceState : uint8
-{
-	Online,
-	Offline,
-	Away,
-	ExtendedAway,
-	DoNotDisturb,
-	Chat
-};
-
-UENUM(BlueprintType)
-enum class EBPOnlineSessionState : uint8
-{
-	/** An online session has not been created yet */
-	NoSession,
-	/** An online session is in the process of being created */
-	Creating,
-	/** Session has been created but the session hasn't started (pre match lobby) */
-	Pending,
-	/** Session has been asked to start (may take time due to communication with backend) */
-	Starting,
-	/** The current session has started. Sessions with join in progress disabled are no longer joinable */
-	InProgress,
-	/** The session is still valid, but the session is no longer being played (post match lobby) */
-	Ending,
-	/** The session is closed and any stats committed */
-	Ended,
-	/** The session is being destroyed */
-	Destroying
-};
-
-// Boy oh boy is this a dirty hack, but I can't figure out a good way to do it otherwise at the moment
-// The UniqueNetId is an abstract class so I can't exactly re-initialize it to make a shared pointer on some functions
-// So I made the blueprintable UniqueNetID into a dual variable struct with access functions and I am converting the const var for the pointer
-// I really need to re-think this later
-USTRUCT(BlueprintType)
-struct FBPUniqueNetId
-{
-	GENERATED_USTRUCT_BODY()
-
-private:
-	bool bUseDirectPointer;
-
-
-public:
-	TSharedPtr<const FUniqueNetId> UniqueNetId;
-	const FUniqueNetId * UniqueNetIdPtr;
-
-	void SetUniqueNetId(const TSharedPtr<const FUniqueNetId> &ID)
-	{
-		bUseDirectPointer = false;
-		UniqueNetIdPtr = nullptr;
-		UniqueNetId = ID;
-	}
-
-	void SetUniqueNetId(const FUniqueNetId *ID)
-	{
-		bUseDirectPointer = true;
-		UniqueNetIdPtr = ID;
-	}
-
-	bool IsValid() const
-	{
-		if (bUseDirectPointer && UniqueNetIdPtr != nullptr && UniqueNetIdPtr->IsValid())
-		{
-			return true;
-		}
-		else if (UniqueNetId.IsValid())
-		{
-			return true;
-		}
-		else
-			return false;
-
-	}
-
-	const FUniqueNetId* GetUniqueNetId() const
-	{
-		if (bUseDirectPointer && UniqueNetIdPtr != nullptr)
-		{
-			// No longer converting to non const as all functions now pass const UniqueNetIds
-			return /*const_cast<FUniqueNetId*>*/(UniqueNetIdPtr);
-		}
-		else if (UniqueNetId.IsValid())
-		{
-			return UniqueNetId.Get();
-		}
-		else
-			return nullptr;
-	}
-
-	// Adding in a compare operator so that std functions will work with this struct
-	FORCEINLINE bool operator==(const FBPUniqueNetId& Other) const
-	{
-		return (IsValid() && Other.IsValid() && (*GetUniqueNetId() == *Other.GetUniqueNetId()));
-	}
-
-	FORCEINLINE bool operator!=(const FBPUniqueNetId& Other) const
-	{
-		return !(IsValid() && Other.IsValid() && (*GetUniqueNetId() == *Other.GetUniqueNetId()));
-	}
-
-	FBPUniqueNetId()
-	{
-		bUseDirectPointer = false;
-		UniqueNetIdPtr = nullptr;
-	}
-};
-
-USTRUCT(BluePrintType)
-struct FBPOnlineUser
-{
-	GENERATED_USTRUCT_BODY()
-
-public:
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend")
-		FBPUniqueNetId UniqueNetId;
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend")
-		FString DisplayName;
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend")
-		FString RealName;
-};
-
-USTRUCT(BluePrintType)
-struct FBPOnlineRecentPlayer : public FBPOnlineUser
-{
-	GENERATED_USTRUCT_BODY()
-
-public:
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend")
-		FString LastSeen;
-};
-
-
-USTRUCT(BlueprintType)
-struct FBPFriendPresenceInfo
-{
-	GENERATED_USTRUCT_BODY()
-
-public:
-
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend")
-		bool bIsOnline = false;
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend")
-		bool bIsPlaying = false;
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend")
-		bool bIsPlayingThisGame = false;
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend")
-		bool bIsJoinable = false;
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend")
-		bool bHasVoiceSupport = false;
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend")
-		EBPOnlinePresenceState PresenceState = EBPOnlinePresenceState::Offline;
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend")
-		FString StatusString;
-
-	FBPFriendPresenceInfo()
-	{
-		bIsOnline = false;
-		bIsPlaying = false;
-		bIsPlayingThisGame = false;
-		bIsJoinable = false;
-		bHasVoiceSupport = false;
-		PresenceState = EBPOnlinePresenceState::Offline;
-	}
-};
-
-USTRUCT(BlueprintType)
-struct FBPFriendInfo
-{
-	GENERATED_USTRUCT_BODY()
-
-public:
-
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend")
-	FString DisplayName;
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend")
-	FString RealName;
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend")
-	EBPOnlinePresenceState OnlineState = EBPOnlinePresenceState::Offline;
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend")
-	FBPUniqueNetId UniqueNetId;
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend")
-	bool bIsPlayingSameGame = false;
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend")
-	FBPFriendPresenceInfo PresenceInfo;
-
-	FBPFriendInfo()
-	{
-		OnlineState = EBPOnlinePresenceState::Offline;
-		bIsPlayingSameGame = false;
-	}
-};
-
-
-/** The types of comparison operations for a given search query */
-// Used to compare session properties
-UENUM(BlueprintType)
-enum class EOnlineComparisonOpRedux : uint8
-{
-	Equals,
-	NotEquals,
-	GreaterThan,
-	GreaterThanEquals,
-	LessThan,
-	LessThanEquals,
-};
-
-
-// Used to store session properties before converting to FVariantData
-USTRUCT(BlueprintType)
-struct FSessionPropertyKeyPair
-{
-	GENERATED_USTRUCT_BODY()
-
-	FName Key;
-	FVariantData Data;
-};
-
-
-// Sent to the FindSessionsAdvanced to filter the end results
-USTRUCT(BlueprintType)
-struct FSessionsSearchSetting
-{
-	GENERATED_USTRUCT_BODY()
-	//UPROPERTY()
-
-
-	// Had to make a copy of this to account for the original not being exposed to blueprints
-	/** How is this session setting compared on the backend searches */
-	EOnlineComparisonOpRedux ComparisonOp;
-
-	// The key pair to search for
-	FSessionPropertyKeyPair PropertyKeyPair;
-};
-
-// Couldn't use the default one as it is not exposed to other modules, had to re-create it here
-// Helper class for various methods to reduce the call hierarchy
-struct FOnlineSubsystemBPCallHelperAdvanced
-{
-public:
-	FOnlineSubsystemBPCallHelperAdvanced(const TCHAR* CallFunctionContext, UWorld* World, FName SystemName = NAME_None)
-		: OnlineSub(Online::GetSubsystem(World, SystemName))
-		, FunctionContext(CallFunctionContext)
-	{
-		if (OnlineSub == nullptr)
-		{
-			FFrame::KismetExecutionMessage(*FString::Printf(TEXT("%s - Invalid or uninitialized OnlineSubsystem"), FunctionContext), ELogVerbosity::Warning);
-		}
-	}
-
-	void QueryIDFromPlayerController(APlayerController* PlayerController)
-	{
-		UserID.Reset();
-		//return const_cast<FUniqueNetId*>(UniqueNetIdPtr);
-		if (APlayerState* PlayerState = (PlayerController != NULL) ? PlayerController->PlayerState : NULL)
-		{
-			UserID = PlayerState->GetUniqueId().GetUniqueNetId();
-			if (!UserID.IsValid())
-			{
-				FFrame::KismetExecutionMessage(*FString::Printf(TEXT("%s - Cannot map local player to unique net ID"), FunctionContext), ELogVerbosity::Warning);
-			}
-		}
-		else
-		{
-			FFrame::KismetExecutionMessage(*FString::Printf(TEXT("%s - Invalid player state"), FunctionContext), ELogVerbosity::Warning);
-		}
-	}
-
-
-	bool IsValid() const
-	{
-		return UserID.IsValid() && (OnlineSub != nullptr);
-	}
-
-public:
-	//TSharedPtr<const FUniqueNetId>& GetUniqueNetId()
-	TSharedPtr</*class*/ const FUniqueNetId> UserID;
-	IOnlineSubsystem* const OnlineSub;
-	const TCHAR* FunctionContext;
-};
-class FOnlineSearchSettingsEx : public FOnlineSearchSettings
-{
-	/**
-	*	Sets a key value pair combination that defines a search parameter
-	*
-	* @param Key key for the setting
-	* @param Value value of the setting
-	* @param InType type of comparison
-	*/
-public:
-
-	void HardSet(FName Key, const FVariantData& Value, EOnlineComparisonOpRedux CompOp)
-	{
-		FOnlineSessionSearchParam* SearchParam = SearchParams.Find(Key);
-
-		TEnumAsByte<EOnlineComparisonOp::Type> op;
-
-		switch (CompOp)
-		{
-		case EOnlineComparisonOpRedux::Equals: op = EOnlineComparisonOp::Equals; break;
-		case EOnlineComparisonOpRedux::GreaterThan: op = EOnlineComparisonOp::GreaterThan; break;
-		case EOnlineComparisonOpRedux::GreaterThanEquals: op = EOnlineComparisonOp::GreaterThanEquals; break;
-		case EOnlineComparisonOpRedux::LessThan: op = EOnlineComparisonOp::LessThan; break;
-		case EOnlineComparisonOpRedux::LessThanEquals: op = EOnlineComparisonOp::LessThanEquals; break;
-		case EOnlineComparisonOpRedux::NotEquals: op = EOnlineComparisonOp::NotEquals; break;
-		default: op = EOnlineComparisonOp::Equals; break;
-		}
-
-		if (SearchParam)
-		{
-			SearchParam->Data = Value;
-			SearchParam->ComparisonOp = op;
-		}
-		else
-		{
-			FOnlineSessionSearchParam searchSetting((int)0, op);
-			searchSetting.Data = Value;
-			SearchParams.Add(Key, searchSetting);
-		}
-	}
-};
-
-#define INVALID_INDEX -1

Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/CancelFindSessionsCallbackProxy.h

@@ -1,46 +0,0 @@
-// Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
-#pragma once
-#include "CoreMinimal.h"
-#include "Engine/Engine.h"
-#include "Interfaces/OnlineSessionInterface.h"
-#include "BlueprintDataDefinitions.h"
-#include "CancelFindSessionsCallbackProxy.generated.h"
-
-UCLASS(MinimalAPI)
-class UCancelFindSessionsCallbackProxy : public UOnlineBlueprintCallProxyBase
-{
-	GENERATED_UCLASS_BODY()
-
-	// Called when there is a successful destroy
-	UPROPERTY(BlueprintAssignable)
-	FEmptyOnlineDelegate OnSuccess;
-
-	// Called when there is an unsuccessful destroy
-	UPROPERTY(BlueprintAssignable)
-	FEmptyOnlineDelegate OnFailure;
-
-	// Cancels finding sessions
-	UFUNCTION(BlueprintCallable, meta=(BlueprintInternalUseOnly = "true", WorldContext="WorldContextObject"), Category = "Online|AdvancedSessions")
-	static UCancelFindSessionsCallbackProxy* CancelFindSessions(UObject* WorldContextObject, class APlayerController* PlayerController);
-
-	// UOnlineBlueprintCallProxyBase interface
-	virtual void Activate() override;
-	// End of UOnlineBlueprintCallProxyBase interface
-
-private:
-	// Internal callback when the operation completes, calls out to the public success/failure callbacks
-	void OnCompleted(bool bWasSuccessful);
-
-private:
-	// The player controller triggering things
-	TWeakObjectPtr<APlayerController> PlayerControllerWeakPtr;
-
-	// The delegate executed by the online subsystem
-	FOnCancelFindSessionsCompleteDelegate Delegate;
-
-	// Handle to the registered OnDestroySessionComplete delegate
-	FDelegateHandle DelegateHandle;
-
-	// The world context object in which this call is taking place
-	TWeakObjectPtr<UObject> WorldContextObject;
-};

Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/CreateSessionCallbackProxyAdvanced.h

@@ -1,107 +0,0 @@
-// Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
-#pragma once
-
-#include "CoreMinimal.h"
-#include "Engine/Engine.h"
-#include "BlueprintDataDefinitions.h"
-#include "CreateSessionCallbackProxyAdvanced.generated.h"
-
-UCLASS(MinimalAPI)
-class UCreateSessionCallbackProxyAdvanced : public UOnlineBlueprintCallProxyBase
-{
-	GENERATED_UCLASS_BODY()
-
-	// Called when the session was created successfully
-	UPROPERTY(BlueprintAssignable)
-	FEmptyOnlineDelegate OnSuccess;
-
-	// Called when there was an error creating the session
-	UPROPERTY(BlueprintAssignable)
-	FEmptyOnlineDelegate OnFailure;
-
-	/**
-	 *    Creates a session with the default online subsystem with advanced optional inputs, for dedicated servers leave UsePresence as false and set IsDedicatedServer to true. Dedicated servers don't use presence.
-	 *    @param PublicConnections	When doing a 'listen' server, this must be >=2 (ListenServer itself counts as a connection)
-	 *    @param bUseLAN			When you want to play LAN, the level to play on must be loaded with option 'bIsLanMatch'
-	 *    @param bUsePresence		Must be true for a 'listen' server (Map must be loaded with option 'listen'), false for a 'dedicated' server.
-	 *	  @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.
-	 */
-	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);
-
-	// UOnlineBlueprintCallProxyBase interface
-	virtual void Activate() override;
-	// End of UOnlineBlueprintCallProxyBase interface
-
-private:
-	// Internal callback when session creation completes, optionally calls StartSession
-	void OnCreateCompleted(FName SessionName, bool bWasSuccessful);
-
-	// Internal callback when session start completes
-	void OnStartCompleted(FName SessionName, bool bWasSuccessful);
-
-	// The player controller triggering things
-	TWeakObjectPtr<APlayerController> PlayerControllerWeakPtr;
-
-	// The delegate executed by the online subsystem
-	FOnCreateSessionCompleteDelegate CreateCompleteDelegate;
-
-	// The delegate executed by the online subsystem
-	FOnStartSessionCompleteDelegate StartCompleteDelegate;
-
-	// Handles to the registered delegates above
-	FDelegateHandle CreateCompleteDelegateHandle;
-	FDelegateHandle StartCompleteDelegateHandle;
-
-	// Number of public connections
-	int NumPublicConnections;
-
-	// Number of private connections
-	int NumPrivateConnections;
-
-	// Whether or not to search LAN
-	bool bUseLAN;
-
-	// Whether or not to allow invites
-	bool bAllowInvites;
-
-	// Whether this is a dedicated server or not
-	bool bDedicatedServer;
-
-	// Whether to use the presence option
-	bool bUsePresence;
-
-	// Whether to prefer the use of lobbies for hosting if the api supports them
-	bool bUseLobbiesIfAvailable;
-
-	// Whether to allow joining via presence
-	bool bAllowJoinViaPresence;
-
-	// Allow joining via presence for friends only
-	bool bAllowJoinViaPresenceFriendsOnly;
-
-	// Delcare the server to be anti cheat protected
-	bool bAntiCheatProtected;
-
-	// Record Stats
-	bool bUsesStats;
-
-	// Should advertise server?
-	bool bShouldAdvertise;
-
-	// Whether to prefer the use of voice chat lobbies if the api supports them
-	bool bUseLobbiesVoiceChatIfAvailable;
-
-	// Whether to start the session automatically after it is created
-	bool bStartAfterCreate;
-
-	// Store extra settings
-	TArray<FSessionPropertyKeyPair> ExtraSettings;
-
-	// The world context object in which this call is taking place
-	TWeakObjectPtr<UObject> WorldContextObject;
-};
-

Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/EndSessionCallbackProxy.h

@@ -1,49 +0,0 @@
-// Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
-#pragma once
-#include "CoreMinimal.h"
-#include "Engine/Engine.h"
-#include "Interfaces/OnlineSessionInterface.h"
-#include "BlueprintDataDefinitions.h"
-#include "EndSessionCallbackProxy.generated.h"
-
-UCLASS(MinimalAPI)
-class UEndSessionCallbackProxy : public UOnlineBlueprintCallProxyBase
-{
-	GENERATED_UCLASS_BODY()
-
-	// Called when there is a successful destroy
-	UPROPERTY(BlueprintAssignable)
-	FEmptyOnlineDelegate OnSuccess;
-
-	// Called when there is an unsuccessful destroy
-	UPROPERTY(BlueprintAssignable)
-	FEmptyOnlineDelegate OnFailure;
-
-	/**
-	 *	  Ends the current sessions, Generally for almost all uses you should be using the engines native Destroy Session node instead.
-	 *	  This exists for people using StartSession and optionally hand managing the session state.
-	 */
-	UFUNCTION(BlueprintCallable, meta=(BlueprintInternalUseOnly = "true", WorldContext="WorldContextObject"), Category = "Online|AdvancedSessions")
-	static UEndSessionCallbackProxy* EndSession(UObject* WorldContextObject, class APlayerController* PlayerController);
-
-	// UOnlineBlueprintCallProxyBase interface
-	virtual void Activate() override;
-	// End of UOnlineBlueprintCallProxyBase interface
-
-private:
-	// Internal callback when the operation completes, calls out to the public success/failure callbacks
-	void OnCompleted(FName SessionName, bool bWasSuccessful);
-
-private:
-	// The player controller triggering things
-	TWeakObjectPtr<APlayerController> PlayerControllerWeakPtr;
-
-	// The delegate executed by the online subsystem
-	FOnEndSessionCompleteDelegate Delegate;
-
-	// Handle to the registered OnDestroySessionComplete delegate
-	FDelegateHandle DelegateHandle;
-
-	// The world context object in which this call is taking place
-	TWeakObjectPtr<UObject> WorldContextObject;
-};

Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/FindFriendSessionCallbackProxy.h

@@ -1,51 +0,0 @@
-// Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
-#pragma once
-
-#include "CoreMinimal.h"
-#include "BlueprintDataDefinitions.h"
-#include "Engine/LocalPlayer.h"
-#include "FindFriendSessionCallbackProxy.generated.h"
-
-DECLARE_LOG_CATEGORY_EXTERN(AdvancedFindFriendSessionLog, Log, All);
-
-DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FBlueprintFindFriendSessionDelegate, const TArray<FBlueprintSessionResult> &, SessionInfo);
-
-UCLASS(MinimalAPI)
-class UFindFriendSessionCallbackProxy : public UOnlineBlueprintCallProxyBase
-{
-	GENERATED_UCLASS_BODY()
-
-	// Called when the friends list successfully was retrieved
-	UPROPERTY(BlueprintAssignable)
-	FBlueprintFindFriendSessionDelegate OnSuccess;
-
-	// Called when there was an error retrieving the friends list
-	UPROPERTY(BlueprintAssignable)
-	FBlueprintFindFriendSessionDelegate OnFailure;
-
-	// Attempts to get the current session that a friend is in
-	UFUNCTION(BlueprintCallable, meta=(BlueprintInternalUseOnly = "true", WorldContext="WorldContextObject"), Category = "Online|AdvancedFriends")
-	static UFindFriendSessionCallbackProxy* FindFriendSession(UObject* WorldContextObject, APlayerController *PlayerController, const FBPUniqueNetId &FriendUniqueNetId);
-
-	virtual void Activate() override;
-
-private:
-	// Internal callback when the friends list is retrieved
-	void OnFindFriendSessionCompleted(int32 LocalPlayer, bool bWasSuccessful, const TArray<FOnlineSessionSearchResult>& SessionInfo);
-
-	// The player controller triggering things
-	TWeakObjectPtr<APlayerController> PlayerControllerWeakPtr;
-
-	// The UniqueNetID of the person to invite
-	FBPUniqueNetId cUniqueNetId;
-
-	// The delegate to call on completion
-	FOnFindFriendSessionCompleteDelegate OnFindFriendSessionCompleteDelegate;
-
-	// Handles to the registered delegates above
-	FDelegateHandle FindFriendSessionCompleteDelegateHandle;
-
-	// The world context object in which this call is taking place
-	TWeakObjectPtr<UObject> WorldContextObject;
-};
-

Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/FindSessionsCallbackProxyAdvanced.h

@@ -1,109 +0,0 @@
-// Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
-#pragma once
-#include "CoreMinimal.h"
-#include "Engine/Engine.h"
-#include "Interfaces/OnlineSessionInterface.h"
-#include "FindSessionsCallbackProxy.h"
-#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()));
-}
-
-UCLASS(MinimalAPI)
-class UFindSessionsCallbackProxyAdvanced : public UOnlineBlueprintCallProxyBase
-{
-	GENERATED_UCLASS_BODY()
-
-	// Called when there is a successful query
-	UPROPERTY(BlueprintAssignable)
-	FBlueprintFindSessionsResultDelegate OnSuccess;
-
-	// Called when there is an unsuccessful query
-	UPROPERTY(BlueprintAssignable)
-	FBlueprintFindSessionsResultDelegate OnFailure;
-
-	// Searches for advertised sessions with the default online subsystem and includes an array of filters
-	UFUNCTION(BlueprintCallable, meta = (BlueprintInternalUseOnly = "true", WorldContext = "WorldContextObject", AutoCreateRefTerm="Filters"), Category = "Online|AdvancedSessions")
-	static UFindSessionsCallbackProxyAdvanced* FindSessionsAdvanced(UObject* WorldContextObject, class APlayerController* PlayerController, int32 MaxResults, bool bUseLAN, EBPServerPresenceSearchType ServerTypeToSearch, const TArray<FSessionsSearchSetting> &Filters, bool bEmptyServersOnly = false, bool bNonEmptyServersOnly = false, bool bSecureServersOnly = false, bool bSearchLobbies = true, int MinSlotsAvailable = 0);
-
-	static bool CompareVariants(const FVariantData &A, const FVariantData &B, EOnlineComparisonOpRedux Comparator);
-	
-	// Filters an array of session results by the given search parameters, returns a new array with the filtered results
-	UFUNCTION(BluePrintCallable, meta = (Category = "Online|AdvancedSessions"))
-	static void FilterSessionResults(const TArray<FBlueprintSessionResult> &SessionResults, const TArray<FSessionsSearchSetting> &Filters, TArray<FBlueprintSessionResult> &FilteredResults);
-	
-	// Removed, the default built in versions work fine in the normal FindSessionsCallbackProxy
-	/*UFUNCTION(BlueprintPure, Category = "Online|Session")
-	static int32 GetPingInMs(const FBlueprintSessionResult& Result);
-
-	UFUNCTION(BlueprintPure, Category = "Online|Session")
-	static FString GetServerName(const FBlueprintSessionResult& Result);
-
-	UFUNCTION(BlueprintPure, Category = "Online|Session")
-	static int32 GetCurrentPlayers(const FBlueprintSessionResult& Result);
-
-	UFUNCTION(BlueprintPure, Category = "Online|Session")
-	static int32 GetMaxPlayers(const FBlueprintSessionResult& Result);*/
-
-
-	// UOnlineBlueprintCallProxyBase interface
-	virtual void Activate() override;
-	// End of UOnlineBlueprintCallProxyBase interface
-
-private:
-	// Internal callback when the session search completes, calls out to the public success/failure callbacks
-	void OnCompleted(bool bSuccess);
-
-	bool bRunSecondSearch;
-	bool bIsOnSecondSearch;
-
-	TArray<FBlueprintSessionResult> SessionSearchResults;
-
-private:
-	// The player controller triggering things
-	TWeakObjectPtr<APlayerController> PlayerControllerWeakPtr;
-
-	// The delegate executed by the online subsystem
-	FOnFindSessionsCompleteDelegate Delegate;
-
-	// Handle to the registered OnFindSessionsComplete delegate
-	FDelegateHandle DelegateHandle;
-
-	// Object to track search results
-	TSharedPtr<FOnlineSessionSearch> SearchObject;
-	TSharedPtr<FOnlineSessionSearch> SearchObjectDedicated;
-
-	// Whether or not to search LAN
-	bool bUseLAN;
-
-	// Whether or not to search for dedicated servers
-	EBPServerPresenceSearchType ServerSearchType;
-
-	// Maximum number of results to return
-	int MaxResults;
-
-	// Store extra settings
-	TArray<FSessionsSearchSetting> SearchSettings;
-
-	// Search for empty servers only
-	bool bEmptyServersOnly;
-
-	// Search for non empty servers only
-	bool bNonEmptyServersOnly;
-
-	// Search for secure servers only
-	bool bSecureServersOnly;
-
-	// Search through lobbies
-	bool bSearchLobbies;
-
-	// Min slots requires to search
-	int MinSlotsAvailable;
-
-	// The world context object in which this call is taking place
-	TWeakObjectPtr<UObject> WorldContextObject;
-};

Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/GetFriendsCallbackProxy.h

@@ -1,49 +0,0 @@
-// Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
-#pragma once
-
-#include "CoreMinimal.h"
-#include "BlueprintDataDefinitions.h"
-#include "Engine/LocalPlayer.h"
-#include "GetFriendsCallbackProxy.generated.h"
-
-DECLARE_LOG_CATEGORY_EXTERN(AdvancedGetFriendsLog, Log, All);
-
-DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FBlueprintGetFriendsListDelegate, const TArray<FBPFriendInfo>&, Results);
-
-UCLASS(MinimalAPI)
-class UGetFriendsCallbackProxy : public UOnlineBlueprintCallProxyBase
-{
-	GENERATED_UCLASS_BODY()
-
-	// Called when the friends list successfully was retrieved
-	UPROPERTY(BlueprintAssignable)
-	FBlueprintGetFriendsListDelegate OnSuccess;
-
-	// Called when there was an error retrieving the friends list
-	UPROPERTY(BlueprintAssignable)
-	FBlueprintGetFriendsListDelegate OnFailure;
-
-	// Gets the players list of friends from the OnlineSubsystem and returns it, can be retrieved later with GetStoredFriendsList
-	UFUNCTION(BlueprintCallable, meta=(BlueprintInternalUseOnly = "true", WorldContext="WorldContextObject"), Category = "Online|AdvancedFriends")
-	static UGetFriendsCallbackProxy* GetAndStoreFriendsList(UObject* WorldContextObject, class APlayerController* PlayerController);
-
-	virtual void Activate() override;
-
-private:
-	// Internal callback when the friends list is retrieved
-	void OnReadFriendsListCompleted(int32 LocalUserNum, bool bWasSuccessful, const FString& ListName, const FString& ErrorString);
-
-	// The player controller triggering things
-	TWeakObjectPtr<APlayerController> PlayerControllerWeakPtr;
-
-	// The delegate executed
-	FOnReadFriendsListComplete FriendListReadCompleteDelegate;
-
-	// The Type of friends list to get
-	// Removed because all but the facebook interfaces don't even currently support anything but the default friends list.
-	//EBPFriendsLists FriendListToGet;
-
-	// The world context object in which this call is taking place
-	TWeakObjectPtr<UObject> WorldContextObject;
-};
-

Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/GetRecentPlayersCallbackProxy.h

@@ -1,49 +0,0 @@
-// Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
-#pragma once
-
-#include "CoreMinimal.h"
-#include "BlueprintDataDefinitions.h"
-#include "GetRecentPlayersCallbackProxy.generated.h"
-
-DECLARE_LOG_CATEGORY_EXTERN(AdvancedGetRecentPlayersLog, Log, All);
-
-DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FBlueprintGetRecentPlayersDelegate, const TArray<FBPOnlineRecentPlayer>&, Results);
-
-UCLASS(MinimalAPI)
-class UGetRecentPlayersCallbackProxy : public UOnlineBlueprintCallProxyBase
-{
-	GENERATED_UCLASS_BODY()
-
-	// Called when the friends list successfully was retrieved
-	UPROPERTY(BlueprintAssignable)
-	FBlueprintGetRecentPlayersDelegate OnSuccess;
-
-	// Called when there was an error retrieving the friends list
-	UPROPERTY(BlueprintAssignable)
-	FBlueprintGetRecentPlayersDelegate OnFailure;
-
-	// Gets the list of recent players from the OnlineSubsystem and returns it, can be retrieved later with GetStoredRecentPlayersList, can fail if no recent players are found
-	UFUNCTION(BlueprintCallable, meta=(BlueprintInternalUseOnly = "true", WorldContext="WorldContextObject"), Category = "Online|AdvancedFriends")
-	static UGetRecentPlayersCallbackProxy* GetAndStoreRecentPlayersList(UObject* WorldContextObject, const FBPUniqueNetId &UniqueNetId);
-
-	virtual void Activate() override;
-
-private:
-	// Internal callback when the friends list is retrieved
-	void OnQueryRecentPlayersCompleted(const FUniqueNetId &UserID, const FString &Namespace, bool bWasSuccessful, const FString& ErrorString);
-	// Handle to the registered OnFindSessionsComplete delegate
-	FDelegateHandle DelegateHandle;
-
-	// The player controller triggering things
-	//TWeakObjectPtr<APlayerController> PlayerControllerWeakPtr;
-
-	// The UniqueNetID of the person to get recent players for
-	FBPUniqueNetId cUniqueNetId;
-
-	// The delegate executed
-	FOnQueryRecentPlayersCompleteDelegate QueryRecentPlayersCompleteDelegate;
-
-	// The world context object in which this call is taking place
-	TWeakObjectPtr<UObject> WorldContextObject;
-};
-

Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/GetUserPrivilegeCallbackProxy.h

@@ -1,45 +0,0 @@
-// Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
-#pragma once
-
-#include "CoreMinimal.h"
-#include "BlueprintDataDefinitions.h"
-#include "Interfaces/OnlineIdentityInterface.h"
-#include "GetUserPrivilegeCallbackProxy.generated.h"
-
-DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FBlueprintGetUserPrivilegeDelegate,/* const &FBPUniqueNetId, PlayerID,*/ EBPUserPrivileges, QueriedPrivilege, bool, HadPrivilege);
-
-UCLASS(MinimalAPI)
-class UGetUserPrivilegeCallbackProxy : public UOnlineBlueprintCallProxyBase
-{
-	GENERATED_UCLASS_BODY()
-
-	// Called when there is a successful destroy
-	UPROPERTY(BlueprintAssignable)
-	FBlueprintGetUserPrivilegeDelegate OnSuccess;
-
-	// Called when there is an unsuccessful destroy
-	UPROPERTY(BlueprintAssignable)
-	FEmptyOnlineDelegate OnFailure;
-
-	// Gets the privilage of the user
-	UFUNCTION(BlueprintCallable, meta=(BlueprintInternalUseOnly = "true", WorldContext="WorldContextObject"), Category = "Online|AdvancedIdentity")
-	static UGetUserPrivilegeCallbackProxy* GetUserPrivilege(UObject* WorldContextObject, const EBPUserPrivileges & PrivilegeToCheck, const FBPUniqueNetId & PlayerUniqueNetID);
-
-	// UOnlineBlueprintCallProxyBase interface
-	virtual void Activate() override;
-	// End of UOnlineBlueprintCallProxyBase interface
-
-private:
-	// Internal callback when the operation completes, calls out to the public success/failure callbacks
-	void OnCompleted(const FUniqueNetId& PlayerID, EUserPrivileges::Type Privilege, uint32 Result);
-
-private:
-	// The player controller triggering things
-	FBPUniqueNetId PlayerUniqueNetID;
-
-	// Privilege to check
-	EBPUserPrivileges UserPrivilege;
-
-	// The world context object in which this call is taking place
-	TWeakObjectPtr<UObject> WorldContextObject;
-};

Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/LoginUserCallbackProxy.h

@@ -1,55 +0,0 @@
-// Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
-#pragma once
-
-#include "CoreMinimal.h"
-#include "BlueprintDataDefinitions.h"
-#include "Interfaces/OnlineIdentityInterface.h"
-#include "Engine/LocalPlayer.h"
-#include "LoginUserCallbackProxy.generated.h"
-
-UCLASS(MinimalAPI)
-class ULoginUserCallbackProxy : public UOnlineBlueprintCallProxyBase
-{
-	GENERATED_UCLASS_BODY()
-
-	// Called when there is a successful destroy
-	UPROPERTY(BlueprintAssignable)
-	FEmptyOnlineDelegate OnSuccess;
-
-	// Called when there is an unsuccessful destroy
-	UPROPERTY(BlueprintAssignable)
-	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);
-
-	// UOnlineBlueprintCallProxyBase interface
-	virtual void Activate() override;
-	// End of UOnlineBlueprintCallProxyBase interface
-
-private:
-	// Internal callback when the operation completes, calls out to the public success/failure callbacks
-	void OnCompleted(int32 LocalUserNum, bool bWasSuccessful, const FUniqueNetId& UserId, const FString& ErrorVal);
-
-private:
-	// The player controller triggering things
-	TWeakObjectPtr<APlayerController> PlayerControllerWeakPtr;
-
-	// The user ID
-	FString UserID;
-
-	// The user pass / token
-	FString UserToken;
-
-	FString AuthType;
-
-	// The delegate executed by the online subsystem
-	FOnLoginCompleteDelegate Delegate;
-
-	// Handle to the registered OnDestroySessionComplete delegate
-	FDelegateHandle DelegateHandle;
-
-	// The world context object in which this call is taking place
-	TWeakObjectPtr<UObject> WorldContextObject;
-};

Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/LogoutUserCallbackProxy.h

@@ -1,47 +0,0 @@
-// Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
-#pragma once
-
-#include "CoreMinimal.h"
-#include "BlueprintDataDefinitions.h"
-#include "Interfaces/OnlineIdentityInterface.h"
-#include "Engine/LocalPlayer.h"
-#include "LogoutUserCallbackProxy.generated.h"
-
-UCLASS(MinimalAPI)
-class ULogoutUserCallbackProxy : public UOnlineBlueprintCallProxyBase
-{
-	GENERATED_UCLASS_BODY()
-
-	// Called when there is a successful destroy
-	UPROPERTY(BlueprintAssignable)
-	FEmptyOnlineDelegate OnSuccess;
-
-	// Called when there is an unsuccessful destroy
-	UPROPERTY(BlueprintAssignable)
-	FEmptyOnlineDelegate OnFailure;
-
-	// Logs out of the identity interface
-	UFUNCTION(BlueprintCallable, meta=(BlueprintInternalUseOnly = "true", WorldContext="WorldContextObject"), Category = "Online|AdvancedIdentity")
-	static ULogoutUserCallbackProxy* LogoutUser(UObject* WorldContextObject, class APlayerController* PlayerController);
-
-	// UOnlineBlueprintCallProxyBase interface
-	virtual void Activate() override;
-	// End of UOnlineBlueprintCallProxyBase interface
-
-private:
-	// Internal callback when the operation completes, calls out to the public success/failure callbacks
-	void OnCompleted(int LocalUserNum, bool bWasSuccessful);
-
-private:
-	// The player controller triggering things
-	TWeakObjectPtr<APlayerController> PlayerControllerWeakPtr;
-
-	// The delegate executed by the online subsystem
-	FOnLogoutCompleteDelegate Delegate;
-
-	// Handle to the registered OnDestroySessionComplete delegate
-	FDelegateHandle DelegateHandle;
-
-	// The world context object in which this call is taking place
-	TWeakObjectPtr<UObject> WorldContextObject;
-};

Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/OnlineSubSystemHeader.h

@@ -1,27 +0,0 @@
-#pragma once
-
-//#include "EngineMinimal.h"
-//#include "Core.h"
-//#include "OnlineSessionInterface.h"
-//#include "OnlineSessionSettings.h"
-//#include "OnlineDelegateMacros.h"
-//#include "OnlineSubsystem.h"
-//#include "OnlineSubsystemImpl.h"
-//#include "OnlineSubsystemUtils.h"
-//#include "OnlineSubsystemUtilsModule.h"
-//#include "ModuleManager.h"
-//#include "OnlineSubsystemUtilsClasses.h"
-//#include "BlueprintDataDefinitions.h"
-
-
-/*#include "VoiceEngineImpl.h"
-#include "VoiceInterfaceImpl.h"
-#include "Voice.h""
-*/
-
-// Found this in the steam controller, seems like a nice thought since steam is throwing errors
-// Disable crazy warnings that claim that standard C library is "deprecated".
-//#ifdef _MSC_VER
-//#pragma warning(push)
-//#pragma warning(disable:4996)
-//#endif

Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/SendFriendInviteCallbackProxy.h

@@ -1,49 +0,0 @@
-// Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
-#pragma once
-
-#include "CoreMinimal.h"
-#include "BlueprintDataDefinitions.h"
-#include "Engine/LocalPlayer.h"
-#include "SendFriendInviteCallbackProxy.generated.h"
-
-DECLARE_LOG_CATEGORY_EXTERN(AdvancedSendFriendInviteLog, Log, All);
-
-DECLARE_DYNAMIC_MULTICAST_DELEGATE(FBlueprintSendFriendInviteDelegate);
-
-UCLASS(MinimalAPI)
-class USendFriendInviteCallbackProxy : public UOnlineBlueprintCallProxyBase
-{
-	GENERATED_UCLASS_BODY()
-
-	// Called when the friends list successfully was retrieved
-	UPROPERTY(BlueprintAssignable)
-	FBlueprintSendFriendInviteDelegate OnSuccess;
-
-	// Called when there was an error retrieving the friends list
-	UPROPERTY(BlueprintAssignable)
-	FBlueprintSendFriendInviteDelegate OnFailure;
-
-	// Adds a friend who is using the defined UniqueNetId, some interfaces do now allow this function to be called (INCLUDING STEAM)
-	UFUNCTION(BlueprintCallable, meta=(BlueprintInternalUseOnly = "true", WorldContext="WorldContextObject"), Category = "Online|AdvancedFriends")
-	static USendFriendInviteCallbackProxy* SendFriendInvite(UObject* WorldContextObject, APlayerController *PlayerController, const FBPUniqueNetId &UniqueNetIDInvited);
-
-	virtual void Activate() override;
-
-private:
-	// Internal callback when the friends list is retrieved
-	void OnSendInviteComplete(int32 LocalPlayerNum, bool bWasSuccessful, const FUniqueNetId &InvitedPlayer, const FString &ListName, const FString &ErrorString);
-
-
-	// The player controller triggering things
-	TWeakObjectPtr<APlayerController> PlayerControllerWeakPtr;
-
-	// The UniqueNetID of the person to invite
-	FBPUniqueNetId cUniqueNetId;
-
-	// The delegate to call on completion
-	FOnSendInviteComplete OnSendInviteCompleteDelegate;
-
-	// The world context object in which this call is taking place
-	TWeakObjectPtr<UObject> WorldContextObject;
-};
-

Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/StartSessionCallbackProxyAdvanced.h

@@ -1,46 +0,0 @@
-#pragma once
-
-#include "CoreMinimal.h"
-#include "BlueprintDataDefinitions.h"
-#include "StartSessionCallbackProxyAdvanced.generated.h"
-
-UCLASS(MinimalAPI)
-class UStartSessionCallbackProxyAdvanced : public UOnlineBlueprintCallProxyBase
-{
-	GENERATED_UCLASS_BODY()
-	// Called when the session starts successfully
-	UPROPERTY(BlueprintAssignable)
-	FEmptyOnlineDelegate OnSuccess;
-
-	// Called when there is an error starting the session
-	UPROPERTY(BlueprintAssignable)
-	FEmptyOnlineDelegate OnFailure;
-
-	/**
-	 * Starts a session with the default online subsystem. The session needs to be previously created by calling the "CreateAdvancedSession" node.
-	 * @param WorldContextObject
-	 */
-	UFUNCTION(
-		BlueprintCallable
-		, meta=(BlueprintInternalUseOnly = "true", WorldContext="WorldContextObject")
-		, Category = "Online|AdvancedSessions"
-	)
-	static UStartSessionCallbackProxyAdvanced* StartAdvancedSession(UObject* WorldContextObject);
-
-	// UOnlineBlueprintCallProxyBase interface
-	virtual void Activate() override;
-	// End of UOnlineBlueprintCallProxyBase interface
-
-private:
-	// Internal callback when session start completes
-	void OnStartCompleted(FName SessionName, bool bWasSuccessful);
-
-	// The delegate executed by the online subsystem
-	FOnStartSessionCompleteDelegate StartCompleteDelegate;
-
-	// Handles to the registered delegates above
-	FDelegateHandle StartCompleteDelegateHandle;
-
-	// The world context object in which this call is taking place
-	TWeakObjectPtr<UObject> WorldContextObject;
-};

Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/UpdateSessionCallbackProxyAdvanced.h

@@ -1,69 +0,0 @@
-// Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
-#pragma once
-
-#include "CoreMinimal.h"
-#include "Engine/Engine.h"
-#include "BlueprintDataDefinitions.h"
-#include "UpdateSessionCallbackProxyAdvanced.generated.h"
-
-UCLASS(MinimalAPI)
-class UUpdateSessionCallbackProxyAdvanced : public UOnlineBlueprintCallProxyBase
-{
-	GENERATED_UCLASS_BODY()
-
-	// Called when the session was updated successfully
-	UPROPERTY(BlueprintAssignable)
-	FEmptyOnlineDelegate OnSuccess;
-
-	// Called when there was an error updating the session
-	UPROPERTY(BlueprintAssignable)
-	FEmptyOnlineDelegate OnFailure;
-
-	// Creates a session with the default online subsystem with advanced optional inputs, you MUST fill in all categories or it will pass in values that you didn't want as default values
-	UFUNCTION(BlueprintCallable, meta=(BlueprintInternalUseOnly = "true", WorldContext="WorldContextObject",AutoCreateRefTerm="ExtraSettings"), Category = "Online|AdvancedSessions")
-	static UUpdateSessionCallbackProxyAdvanced* UpdateSession(UObject* WorldContextObject, const TArray<FSessionPropertyKeyPair> &ExtraSettings, int32 PublicConnections = 100, int32 PrivateConnections = 0, bool bUseLAN = false, bool bAllowInvites = false, bool bAllowJoinInProgress = false, bool bRefreshOnlineData = true, bool bIsDedicatedServer = false, bool bShouldAdvertise = true);
-
-	// UOnlineBlueprintCallProxyBase interface
-	virtual void Activate() override;
-	// End of UOnlineBlueprintCallProxyBase interface
-
-private:
-	// Internal callback when session creation completes, calls StartSession
-	void OnUpdateCompleted(FName SessionName, bool bWasSuccessful);
-
-	// The delegate executed by the online subsystem
-	FOnUpdateSessionCompleteDelegate OnUpdateSessionCompleteDelegate;
-
-	// Handles to the registered delegates above
-	FDelegateHandle OnUpdateSessionCompleteDelegateHandle;
-
-	// Number of public connections
-	int NumPublicConnections = 100;
-
-	// Number of private connections
-	int NumPrivateConnections = 0;
-
-	// Whether or not to search LAN
-	bool bUseLAN = false;
-
-	// Whether or not to allow invites
-	bool bAllowInvites = true;
-
-	// Store extra settings
-	TArray<FSessionPropertyKeyPair> ExtraSettings;
-
-	// Whether to update the online data
-	bool bRefreshOnlineData = true;
-
-	// Allow joining in progress
-	bool bAllowJoinInProgress = true;
-
-	// Update whether this is a dedicated server or not
-	bool bDedicatedServer = false;
-
-	bool bShouldAdvertise = true;
-
-	// The world context object in which this call is taking place
-	TWeakObjectPtr<UObject> WorldContextObject;
-};
-

Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedExternalUILibrary.cpp

@@ -1,209 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-#include "AdvancedExternalUILibrary.h"
-#include "Engine/LocalPlayer.h"
-
-
-//General Log
-DEFINE_LOG_CATEGORY(AdvancedExternalUILog);
-
-void UAdvancedExternalUILibrary::ShowAccountUpgradeUI(UObject* WorldContextObject, 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);
-
-	if (!ExternalUIInterface.IsValid())
-	{
-		UE_LOG(AdvancedExternalUILog, Warning, TEXT("ShowAccountUpgradeUI Failed to get External UI interface!"));
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	ExternalUIInterface->ShowAccountUpgradeUI(*PlayerRequestingAccountUpgradeUI.GetUniqueNetId());
-	Result = EBlueprintResultSwitch::OnSuccess;
-}
-
-void UAdvancedExternalUILibrary::ShowProfileUI(UObject* WorldContextObject, 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);
-
-	if (!ExternalUIInterface.IsValid())
-	{
-		UE_LOG(AdvancedExternalUILog, Warning, TEXT("ShowProfileUI Failed to get External UI interface!"));
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-	
-	ExternalUIInterface->ShowProfileUI(*PlayerViewingProfile.GetUniqueNetId(), *PlayerToViewProfileOf.GetUniqueNetId(), NULL);
-	Result = EBlueprintResultSwitch::OnSuccess;
-}
-
-
-
-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)
-{
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	IOnlineExternalUIPtr ExternalUIInterface = Online::GetExternalUIInterface(World);
-
-	if (!ExternalUIInterface.IsValid())
-	{
-		UE_LOG(AdvancedExternalUILog, Warning, TEXT("ShowWebURLUI Failed to get External UI interface!"));
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	URLToShow = URLToShow.Replace(TEXT("http://"), TEXT(""));
-	URLToShow = URLToShow.Replace(TEXT("https://"), TEXT(""));
-
-	FShowWebUrlParams Params;
-	Params.AllowedDomains = AllowedDomains;
-	Params.bEmbedded = bEmbedded;
-	Params.bShowBackground = bShowBackground;
-	Params.bShowCloseButton = bShowCloseButton;
-	Params.OffsetX = OffsetX;
-	Params.OffsetY = OffsetY;
-	Params.SizeX = SizeX;
-	Params.SizeY = SizeY;
-
-	ExternalUIInterface->ShowWebURL(URLToShow, Params);
-	Result = EBlueprintResultSwitch::OnSuccess;
-}
-
-void UAdvancedExternalUILibrary::CloseWebURLUI(UObject* WorldContextObject)
-{
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		return;
-	}
-
-	IOnlineExternalUIPtr ExternalUIInterface = Online::GetExternalUIInterface(World);
-
-	if (!ExternalUIInterface.IsValid())
-	{
-		UE_LOG(AdvancedExternalUILog, Warning, TEXT("CloseWebURLUI Failed to get External UI interface!"));
-		return;
-	}
-
-	ExternalUIInterface->CloseWebURL();
-}
-
-void UAdvancedExternalUILibrary::ShowLeaderBoardUI(UObject* WorldContextObject, FString LeaderboardName, EBlueprintResultSwitch &Result)
-{
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	IOnlineExternalUIPtr ExternalUIInterface = Online::GetExternalUIInterface(World);
-
-	if (!ExternalUIInterface.IsValid())
-	{
-		UE_LOG(AdvancedExternalUILog, Warning, TEXT("ShowLeaderboardsUI Failed to get External UI interface!"));
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	ExternalUIInterface->ShowLeaderboardUI(LeaderboardName);
-	Result = EBlueprintResultSwitch::OnSuccess;
-
-}
-
-
-void UAdvancedExternalUILibrary::ShowInviteUI(UObject* WorldContextObject, APlayerController *PlayerController, EBlueprintResultSwitch &Result)
-{
-	if (!PlayerController)
-	{
-		UE_LOG(AdvancedExternalUILog, Warning, TEXT("ShowInviteUI Had a bad Player Controller!"));
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	IOnlineExternalUIPtr ExternalUIInterface = Online::GetExternalUIInterface(World);
-
-	if (!ExternalUIInterface.IsValid())
-	{
-		UE_LOG(AdvancedExternalUILog, Warning, TEXT("ShowInviteUI Failed to get External UI interface!"));
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	ULocalPlayer* Player = Cast<ULocalPlayer>(PlayerController->Player);
-
-	if (!Player)
-	{
-		UE_LOG(AdvancedExternalUILog, Warning, TEXT("ShowInviteUI Failed to get ULocalPlayer for the given PlayerController!"));
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	ExternalUIInterface->ShowInviteUI(Player->GetControllerId(), NAME_GameSession);
-	Result = EBlueprintResultSwitch::OnSuccess;
-}
-
-void UAdvancedExternalUILibrary::ShowFriendsUI(UObject* WorldContextObject, APlayerController *PlayerController, EBlueprintResultSwitch &Result)
-{
-	if (!PlayerController)
-	{
-		UE_LOG(AdvancedExternalUILog, Warning, TEXT("ShowFriendsUI Had a bad Player Controller!"));
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	IOnlineExternalUIPtr ExternalUIInterface = Online::GetExternalUIInterface(World);
-
-	if (!ExternalUIInterface.IsValid())
-	{
-		UE_LOG(AdvancedExternalUILog, Warning, TEXT("ShowFriendsUI Failed to get External UI interface!"));
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	ULocalPlayer* Player = Cast<ULocalPlayer>(PlayerController->Player);
-
-	if (!Player)
-	{
-		UE_LOG(AdvancedExternalUILog, Warning, TEXT("ShowFriendsUI Failed to get ULocalPlayer for the given PlayerController!"));
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	ExternalUIInterface->ShowFriendsUI(Player->GetControllerId());
-	Result = EBlueprintResultSwitch::OnSuccess;
-}

Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsGameInstance.cpp

@@ -1,334 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-#include "AdvancedFriendsGameInstance.h"
-#include "Kismet/GameplayStatics.h"
-#include "GameFramework/PlayerController.h"
-
-//General Log
-DEFINE_LOG_CATEGORY(AdvancedFriendsInterfaceLog);
-
-UAdvancedFriendsGameInstance::UAdvancedFriendsGameInstance(const FObjectInitializer& ObjectInitializer) 
-	: Super(ObjectInitializer)
-	, bCallFriendInterfaceEventsOnPlayerControllers(true)
-	, bCallIdentityInterfaceEventsOnPlayerControllers(true)
-	, bCallVoiceInterfaceEventsOnPlayerControllers(true)
-	, bEnableTalkingStatusDelegate(true)
-	, SessionInviteReceivedDelegate(FOnSessionInviteReceivedDelegate::CreateUObject(this, &ThisClass::OnSessionInviteReceivedMaster))
-	, SessionInviteAcceptedDelegate(FOnSessionUserInviteAcceptedDelegate::CreateUObject(this, &ThisClass::OnSessionInviteAcceptedMaster))
-	, PlayerTalkingStateChangedDelegate(FOnPlayerTalkingStateChangedDelegate::CreateUObject(this, &ThisClass::OnPlayerTalkingStateChangedMaster))
-	, PlayerLoginChangedDelegate(FOnLoginChangedDelegate::CreateUObject(this, &ThisClass::OnPlayerLoginChangedMaster))
-	, PlayerLoginStatusChangedDelegate(FOnLoginStatusChangedDelegate::CreateUObject(this, &ThisClass::OnPlayerLoginStatusChangedMaster))
-{
-}
-
-void UAdvancedFriendsGameInstance::Shutdown()
-{
-	IOnlineSessionPtr SessionInterface = Online::GetSessionInterface(GetWorld());
-	
-	if (!SessionInterface.IsValid())
-	{
-		UE_LOG(AdvancedFriendsInterfaceLog, Warning, TEXT("UAdvancedFriendsGameInstance Failed to get session system!"));
-		//return;
-	}
-	else
-	{
-		// Clear all of the delegate handles here
-		SessionInterface->ClearOnSessionUserInviteAcceptedDelegate_Handle(SessionInviteAcceptedDelegateHandle);
-		SessionInterface->ClearOnSessionInviteReceivedDelegate_Handle(SessionInviteReceivedDelegateHandle);
-	}
-
-
-	if (bEnableTalkingStatusDelegate)
-	{
-		IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface(GetWorld());
-
-		if (VoiceInterface.IsValid())
-		{
-			VoiceInterface->ClearOnPlayerTalkingStateChangedDelegate_Handle(PlayerTalkingStateChangedDelegateHandle);
-		}
-		else
-		{
-
-			UE_LOG(AdvancedFriendsInterfaceLog, Warning, TEXT("UAdvancedFriendsInstance Failed to get voice interface!"));
-		}
-	}
-
-	IOnlineIdentityPtr IdentityInterface = Online::GetIdentityInterface(GetWorld());
-
-	if (IdentityInterface.IsValid())
-	{
-		IdentityInterface->ClearOnLoginChangedDelegate_Handle(PlayerLoginChangedDelegateHandle);
-		
-
-		// I am just defaulting to player 1
-		IdentityInterface->ClearOnLoginStatusChangedDelegate_Handle(0, PlayerLoginStatusChangedDelegateHandle);
-	}
-
-
-	Super::Shutdown();
-}
-
-void UAdvancedFriendsGameInstance::Init()
-{
-	IOnlineSessionPtr SessionInterface = Online::GetSessionInterface(GetWorld());//OnlineSub->GetSessionInterface();
-
-	if (SessionInterface.IsValid())
-	{
-		// Currently doesn't store a handle or assign a delegate to any local player beyond the first.....should handle?
-		// Thought about directly handling it but friends for multiple players probably isn't required
-		// Iterating through the local player TArray only works if it has had players assigned to it, most of the online interfaces don't support
-		// Multiple logins either (IE: Steam)
-		SessionInviteAcceptedDelegateHandle = SessionInterface->AddOnSessionUserInviteAcceptedDelegate_Handle(SessionInviteAcceptedDelegate);
-
-		SessionInviteReceivedDelegateHandle = SessionInterface->AddOnSessionInviteReceivedDelegate_Handle(SessionInviteReceivedDelegate);
-	}
-	else
-	{
-		UE_LOG(AdvancedFriendsInterfaceLog, Warning, TEXT("UAdvancedFriendsInstance Failed to get session interface!"));
-		//return;
-	}
-
-	// Beginning work on the voice interface
-	if (bEnableTalkingStatusDelegate)
-	{
-		IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface(GetWorld());
-
-		if (VoiceInterface.IsValid())
-		{
-			PlayerTalkingStateChangedDelegateHandle = VoiceInterface->AddOnPlayerTalkingStateChangedDelegate_Handle(PlayerTalkingStateChangedDelegate);
-		}
-		else
-		{
-
-			UE_LOG(AdvancedFriendsInterfaceLog, Warning, TEXT("UAdvancedFriendsInstance Failed to get voice interface!"));
-		}
-	}
-
-	IOnlineIdentityPtr IdentityInterface = Online::GetIdentityInterface(GetWorld());
-
-	if (IdentityInterface.IsValid())
-	{
-		PlayerLoginChangedDelegateHandle = IdentityInterface->AddOnLoginChangedDelegate_Handle(PlayerLoginChangedDelegate);
-
-		// Just defaulting to player 1
-		PlayerLoginStatusChangedDelegateHandle = IdentityInterface->AddOnLoginStatusChangedDelegate_Handle(0, PlayerLoginStatusChangedDelegate);
-	}
-	else
-	{
-		UE_LOG(AdvancedFriendsInterfaceLog, Warning, TEXT("UAdvancedFriendsInstance Failed to get identity interface!"));
-	}
-
-
-	Super::Init();
-}
-
-/*void UAdvancedFriendsGameInstance::PostLoad()
-{
-	Super::PostLoad();
-}*/
-
-
-// Removed because it never gets called by the online subsystems
-/*void UAdvancedFriendsGameInstance::OnSessionInviteReceivedMaster(const FUniqueNetId &InvitedPlayer, const FUniqueNetId &FriendInviting, const FOnlineSessionSearchResult& Session)
-{
-	// Just call the blueprint event to let the user handle this
-
-	FBPUniqueNetId IP, FI;
-
-	IP.SetUniqueNetId(&InvitedPlayer);
-
-	FI.SetUniqueNetId(&FriendInviting);
-
-	FBlueprintSessionResult BPS;
-	BPS.OnlineResult = Session;
-	OnSessionInviteReceived(IP,FI,BPS);
-
-	TArray<class APlayerState*>& PlayerArray = GetWorld()->GetGameState()->PlayerArray;
-	const TArray<class ULocalPlayer*>&ControllerArray = this->GetLocalPlayers();
-
-	for (int i = 0; i < ControllerArray.Num(); i++)
-	{
-		if (*PlayerArray[ControllerArray[i]->PlayerController->NetPlayerIndex]->UniqueId.GetUniqueNetId().Get() == InvitedPlayer)
-		{
-			//Run the Event specific to the actor, if the actor has the interface, otherwise ignore
-			if (ControllerArray[i]->PlayerController->GetClass()->ImplementsInterface(UAdvancedFriendsInterface::StaticClass()))
-			{
-				IAdvancedFriendsInterface::Execute_OnSessionInviteReceived(ControllerArray[i]->PlayerController, FI, BPS);
-			}
-			break;
-		}
-	}
-}*/
-
-void UAdvancedFriendsGameInstance::OnPlayerLoginStatusChangedMaster(int32 PlayerNum, ELoginStatus::Type PreviousStatus, ELoginStatus::Type NewStatus, const FUniqueNetId & NewPlayerUniqueNetID)
-{
-	EBPLoginStatus OrigStatus = (EBPLoginStatus)PreviousStatus;
-	EBPLoginStatus CurrentStatus = (EBPLoginStatus)NewStatus;
-	FBPUniqueNetId PlayerID;
-	PlayerID.SetUniqueNetId(&NewPlayerUniqueNetID);
-
-	OnPlayerLoginStatusChanged(PlayerNum, OrigStatus,CurrentStatus,PlayerID);
-
-
-	if (bCallIdentityInterfaceEventsOnPlayerControllers)
-	{
-		APlayerController* Player = UGameplayStatics::GetPlayerController(GetWorld(), PlayerNum);
-
-		if (Player != NULL)
-		{
-			//Run the Event specific to the actor, if the actor has the interface, otherwise ignore
-			if (Player->GetClass()->ImplementsInterface(UAdvancedFriendsInterface::StaticClass()))
-			{
-				IAdvancedFriendsInterface::Execute_OnPlayerLoginStatusChanged(Player, OrigStatus, CurrentStatus, PlayerID);
-			}
-		}
-		else
-		{
-			UE_LOG(AdvancedFriendsInterfaceLog, Warning, TEXT("UAdvancedFriendsInstance Failed to get a controller with the specified index in OnPlayerLoginStatusChangedMaster!"));
-		}
-	}
-}
-
-void UAdvancedFriendsGameInstance::OnPlayerLoginChangedMaster(int32 PlayerNum)
-{
-	OnPlayerLoginChanged(PlayerNum);
-
-	if (bCallIdentityInterfaceEventsOnPlayerControllers)
-	{
-		APlayerController* Player = UGameplayStatics::GetPlayerController(GetWorld(), PlayerNum);
-
-		if (Player != NULL)
-		{
-			//Run the Event specific to the actor, if the actor has the interface, otherwise ignore
-			if (Player->GetClass()->ImplementsInterface(UAdvancedFriendsInterface::StaticClass()))
-			{
-				IAdvancedFriendsInterface::Execute_OnPlayerLoginChanged(Player, PlayerNum);
-			}
-		}
-		else
-		{
-			UE_LOG(AdvancedFriendsInterfaceLog, Warning, TEXT("UAdvancedFriendsInstance Failed to get a controller with the specified index in OnPlayerLoginChanged!"));
-		}
-	}
-}
-
-void UAdvancedFriendsGameInstance::OnPlayerTalkingStateChangedMaster(TSharedRef<const FUniqueNetId> PlayerId, bool bIsTalking)
-{
-	FBPUniqueNetId PlayerTalking;
-	PlayerTalking.SetUniqueNetId(PlayerId);
-	OnPlayerTalkingStateChanged(PlayerTalking, bIsTalking);
-
-	if (bCallVoiceInterfaceEventsOnPlayerControllers)
-	{
-		APlayerController* Player = NULL;
-
-		for (const ULocalPlayer* LPlayer : LocalPlayers)
-		{
-			Player = UGameplayStatics::GetPlayerController(GetWorld(), LPlayer->GetControllerId());
-
-			if (Player != NULL)
-			{
-				//Run the Event specific to the actor, if the actor has the interface, otherwise ignore
-				if (Player->GetClass()->ImplementsInterface(UAdvancedFriendsInterface::StaticClass()))
-				{
-					IAdvancedFriendsInterface::Execute_OnPlayerVoiceStateChanged(Player, PlayerTalking, bIsTalking);
-				}
-			}
-			else
-			{
-				UE_LOG(AdvancedFriendsInterfaceLog, Warning, TEXT("UAdvancedFriendsInstance Failed to get a controller with the specified index in OnVoiceStateChanged!"));
-			}
-		}
-	}
-}
-
-void UAdvancedFriendsGameInstance::OnSessionInviteReceivedMaster(const FUniqueNetId & PersonInvited, const FUniqueNetId & PersonInviting, const FString& AppId, const FOnlineSessionSearchResult& SessionToJoin)
-{
-	if (SessionToJoin.IsValid())
-	{
-		FBlueprintSessionResult BluePrintResult;
-		BluePrintResult.OnlineResult = SessionToJoin;
-
-		FBPUniqueNetId PInvited;
-		PInvited.SetUniqueNetId(&PersonInvited);
-
-		FBPUniqueNetId PInviting;
-		PInviting.SetUniqueNetId(&PersonInviting);
-
-
-		TArray<APlayerController*> PlayerList;
-		GEngine->GetAllLocalPlayerControllers(PlayerList);
-
-		APlayerController* Player = NULL;
-
-		int32 LocalPlayer = 0;
-		for (int i = 0; i < PlayerList.Num(); i++)
-		{
-			if (*PlayerList[i]->PlayerState->GetUniqueId().GetUniqueNetId() == PersonInvited)
-			{
-				LocalPlayer = i;
-				Player = PlayerList[i];
-				break;
-			}
-		}
-
-		OnSessionInviteReceived(LocalPlayer, PInviting, AppId, BluePrintResult);
-
-		//IAdvancedFriendsInterface* TheInterface = NULL;
-
-		if (Player != NULL)
-		{
-			//Run the Event specific to the actor, if the actor has the interface, otherwise ignore
-			if (Player->GetClass()->ImplementsInterface(UAdvancedFriendsInterface::StaticClass()))
-			{
-				IAdvancedFriendsInterface::Execute_OnSessionInviteReceived(Player, PInviting, BluePrintResult);
-			}
-		}
-		else
-		{
-			UE_LOG(AdvancedFriendsInterfaceLog, Warning, TEXT("UAdvancedFriendsInstance Failed to get a controller with the specified index in OnSessionInviteReceived!"));
-		}
-	}
-	else
-	{
-		UE_LOG(AdvancedFriendsInterfaceLog, Warning, TEXT("UAdvancedFriendsInstance Return a bad search result in OnSessionInviteReceived!"));
-	}
-}
-
-void UAdvancedFriendsGameInstance::OnSessionInviteAcceptedMaster(const bool bWasSuccessful, int32 LocalPlayer, TSharedPtr<const FUniqueNetId> PersonInvited, const FOnlineSessionSearchResult& SessionToJoin)
-{
-	if (bWasSuccessful)
-	{
-		if (SessionToJoin.IsValid())
-		{
-
-			FBlueprintSessionResult BluePrintResult;
-			BluePrintResult.OnlineResult = SessionToJoin;
-
-			FBPUniqueNetId PInvited;
-			PInvited.SetUniqueNetId(PersonInvited);
-
-			OnSessionInviteAccepted(LocalPlayer,PInvited, BluePrintResult);
-
-			APlayerController* Player = UGameplayStatics::GetPlayerController(GetWorld(), LocalPlayer);
-
-			//IAdvancedFriendsInterface* TheInterface = NULL;
-
-			if (Player != NULL)
-			{
-				//Run the Event specific to the actor, if the actor has the interface, otherwise ignore
-				if (Player->GetClass()->ImplementsInterface(UAdvancedFriendsInterface::StaticClass()))
-				{
-					IAdvancedFriendsInterface::Execute_OnSessionInviteAccepted(Player,PInvited, BluePrintResult);
-				}
-			}
-			else
-			{ 
-				UE_LOG(AdvancedFriendsInterfaceLog, Warning, TEXT("UAdvancedFriendsInstance Failed to get a controller with the specified index in OnSessionInviteAccepted!"));
-			}
-		}
-		else
-		{
-			UE_LOG(AdvancedFriendsInterfaceLog, Warning, TEXT("UAdvancedFriendsInstance Return a bad search result in OnSessionInviteAccepted!"));
-		}
-	}
-}

Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsInterface.cpp

@@ -1,9 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-#include "AdvancedFriendsInterface.h"
-
-
-
-UAdvancedFriendsInterface::UAdvancedFriendsInterface(const class FObjectInitializer& ObjectInitializer)
-	: Super(ObjectInitializer)
-{
-}	

Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsLibrary.cpp

@@ -1,281 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-#include "AdvancedFriendsLibrary.h"
-
-
-
-// This is taken directly from UE4 - OnlineSubsystemSteamPrivatePCH.h as a fix for the array_count macro
-
-//General Log
-DEFINE_LOG_CATEGORY(AdvancedFriendsLog);
-
-void UAdvancedFriendsLibrary::SendSessionInviteToFriends(APlayerController *PlayerController, const TArray<FBPUniqueNetId> &Friends, EBlueprintResultSwitch &Result)
-{
-	if (!PlayerController)
-	{
-		UE_LOG(AdvancedFriendsLog, Warning, TEXT("SendSessionInviteToFriend Had a bad Player Controller!"));
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	if (Friends.Num() < 1)
-	{
-		UE_LOG(AdvancedFriendsLog, Warning, TEXT("SendSessionInviteToFriend Had no friends in invitation array!"));
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	IOnlineSessionPtr SessionInterface = Online::GetSessionInterface();
-
-	if (!SessionInterface.IsValid())
-	{
-		UE_LOG(AdvancedFriendsLog, Warning, TEXT("SendSessionInviteToFriend Failed to get session interface!"));
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	ULocalPlayer* Player = Cast<ULocalPlayer>(PlayerController->Player);
-
-	if (!Player)
-	{
-		UE_LOG(AdvancedFriendsLog, Warning, TEXT("SendSessionInviteToFriend failed to get LocalPlayer!"));
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	TArray<TSharedRef<const FUniqueNetId>> List;
-	for (int i = 0; i < Friends.Num(); i++)
-	{
-		TSharedRef<const FUniqueNetId> val(Friends[i].UniqueNetId.ToSharedRef());
-		//TSharedRef<const FUniqueNetId> val(Friends[i].GetUniqueNetId());
-		List.Add(val);
-	}
-
-	if (SessionInterface->SendSessionInviteToFriends(Player->GetControllerId(), NAME_GameSession, List))
-	{
-		Result = EBlueprintResultSwitch::OnSuccess;
-		return;
-	}
-
-	Result = EBlueprintResultSwitch::OnFailure;
-	return;
-}
-
-void UAdvancedFriendsLibrary::SendSessionInviteToFriend(APlayerController *PlayerController, const FBPUniqueNetId &FriendUniqueNetId, EBlueprintResultSwitch &Result)
-{
-	if (!PlayerController)
-	{
-		UE_LOG(AdvancedFriendsLog, Warning, TEXT("SendSessionInviteToFriend Had a bad Player Controller!"));
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	if (!FriendUniqueNetId.IsValid())
-	{
-		UE_LOG(AdvancedFriendsLog, Warning, TEXT("SendSessionInviteToFriend Had a bad UniqueNetId!"));
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	IOnlineSessionPtr SessionInterface = Online::GetSessionInterface();
-
-	if (!SessionInterface.IsValid())
-	{
-		UE_LOG(AdvancedFriendsLog, Warning, TEXT("SendSessionInviteToFriend Failed to get session interface!"));
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	ULocalPlayer* Player = Cast<ULocalPlayer>(PlayerController->Player);
-
-	if (!Player)
-	{
-		UE_LOG(AdvancedFriendsLog, Warning, TEXT("SendSessionInviteToFriend failed to get LocalPlayer!"));
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	if (SessionInterface->SendSessionInviteToFriend(Player->GetControllerId(), NAME_GameSession, *FriendUniqueNetId.GetUniqueNetId()))
-	{
-		Result = EBlueprintResultSwitch::OnSuccess;
-		return;
-	}
-
-	Result = EBlueprintResultSwitch::OnFailure;
-	return;
-}
-
-void UAdvancedFriendsLibrary::GetFriend(APlayerController *PlayerController, const FBPUniqueNetId FriendUniqueNetId, FBPFriendInfo &Friend)
-{
-
-	if (!PlayerController)
-	{
-		UE_LOG(AdvancedFriendsLog, Warning, TEXT("GetFriend Had a bad Player Controller!"));
-		return;
-	}
-
-	if (!FriendUniqueNetId.IsValid())
-	{
-		UE_LOG(AdvancedFriendsLog, Warning, TEXT("GetFriend Had a bad UniqueNetId!"));
-		return;
-	}
-
-	IOnlineFriendsPtr FriendsInterface = Online::GetFriendsInterface();
-
-	if (!FriendsInterface.IsValid())
-	{
-		UE_LOG(AdvancedFriendsLog, Warning, TEXT("GetFriend Failed to get friends interface!"));
-		return;
-	}
-
-	ULocalPlayer* Player = Cast<ULocalPlayer>(PlayerController->Player);
-
-	if (!Player)
-	{
-		UE_LOG(AdvancedFriendsLog, Warning, TEXT("GetFriend failed to get LocalPlayer!"));
-		return;
-	}
-
-	TSharedPtr<FOnlineFriend> fr = FriendsInterface->GetFriend(Player->GetControllerId(), *FriendUniqueNetId.GetUniqueNetId(), EFriendsLists::ToString(EFriendsLists::Default));
-	if (fr.IsValid())
-	{
-		const FOnlineUserPresence& pres = fr->GetPresence();
-		Friend.DisplayName = fr->GetDisplayName();
-		Friend.OnlineState = ((EBPOnlinePresenceState)((int32)pres.Status.State));
-		Friend.RealName = fr->GetRealName();
-		Friend.UniqueNetId.SetUniqueNetId(fr->GetUserId());
-		Friend.bIsPlayingSameGame = pres.bIsPlayingThisGame;
-
-		Friend.PresenceInfo.bHasVoiceSupport = pres.bHasVoiceSupport;
-		Friend.PresenceInfo.bIsJoinable = pres.bIsJoinable;
-		Friend.PresenceInfo.bIsOnline = pres.bIsOnline;
-		Friend.PresenceInfo.bIsPlaying = pres.bIsPlaying;
-		Friend.PresenceInfo.bIsPlayingThisGame = pres.bIsPlayingThisGame;
-		Friend.PresenceInfo.PresenceState = ((EBPOnlinePresenceState)((int32)pres.Status.State));
-		// #TODO: Check back in on this in shipping, epic is missing the UTF8_TO_TCHAR call on converting this and its making an invalid string
-		//Friend.PresenceInfo.StatusString = pres.Status.StatusStr;
-	}
-}
-
-void UAdvancedFriendsLibrary::IsAFriend(APlayerController *PlayerController, const FBPUniqueNetId UniqueNetId, bool &IsFriend)
-{
-	if (!PlayerController)
-	{
-		UE_LOG(AdvancedFriendsLog, Warning, TEXT("IsAFriend Had a bad Player Controller!"));
-		return;
-	}
-
-	if (!UniqueNetId.IsValid())
-	{
-		UE_LOG(AdvancedFriendsLog, Warning, TEXT("IsAFriend Had a bad UniqueNetId!"));
-		return;
-	}
-
-	IOnlineFriendsPtr FriendsInterface = Online::GetFriendsInterface();
-
-	if (!FriendsInterface.IsValid())
-	{
-		UE_LOG(AdvancedFriendsLog, Warning, TEXT("IsAFriend Failed to get friends interface!"));
-		return;
-	}
-
-	ULocalPlayer* Player = Cast<ULocalPlayer>(PlayerController->Player);
-
-	if (!Player)
-	{
-		UE_LOG(AdvancedFriendsLog, Warning, TEXT("IsAFriend Failed to get LocalPlayer!"));
-		return;
-	}
-
-	IsFriend = FriendsInterface->IsFriend(Player->GetControllerId(), *UniqueNetId.GetUniqueNetId(), EFriendsLists::ToString(EFriendsLists::Default));
-}
-
-void UAdvancedFriendsLibrary::GetStoredRecentPlayersList(FBPUniqueNetId UniqueNetId, TArray<FBPOnlineRecentPlayer> &PlayersList)
-{
-	IOnlineFriendsPtr FriendsInterface = Online::GetFriendsInterface();
-	
-	if (!FriendsInterface.IsValid())
-	{
-		UE_LOG(AdvancedFriendsLog, Warning, TEXT("GetRecentPlayersList Failed to get friends interface!"));
-		return;
-	}
-
-	if (!UniqueNetId.IsValid())
-	{
-		UE_LOG(AdvancedFriendsLog, Warning, TEXT("GetRecentPlayersList Failed was given an invalid UniqueNetId!"));
-		return;
-	}
-
-	TArray< TSharedRef<FOnlineRecentPlayer> > PlayerList;
-	
-	// For now getting all namespaces
-	FriendsInterface->GetRecentPlayers(*(UniqueNetId.GetUniqueNetId()),"", PlayerList);
-
-	for (int32 i = 0; i < PlayerList.Num(); i++)
-	{
-		TSharedRef<FOnlineRecentPlayer> Player = PlayerList[i];
-		FBPOnlineRecentPlayer BPF;
-		BPF.DisplayName = Player->GetDisplayName();
-		BPF.RealName = Player->GetRealName();
-		BPF.UniqueNetId.SetUniqueNetId(Player->GetUserId());
-		PlayersList.Add(BPF);
-	}
-}
-
-void UAdvancedFriendsLibrary::GetStoredFriendsList(APlayerController *PlayerController, TArray<FBPFriendInfo> &FriendsList)
-{
-
-	if (!PlayerController)
-	{
-		UE_LOG(AdvancedFriendsLog, Warning, TEXT("GetFriendsList Had a bad Player Controller!"));
-		return;
-	}
-
-	IOnlineFriendsPtr FriendsInterface = Online::GetFriendsInterface();
-	
-	if (!FriendsInterface.IsValid())
-	{
-		UE_LOG(AdvancedFriendsLog, Warning, TEXT("GetFriendsList Failed to get friends interface!"));
-		return;
-	}
-
-	ULocalPlayer* Player = Cast<ULocalPlayer>(PlayerController->Player);
-
-	if (!Player)
-	{
-		UE_LOG(AdvancedFriendsLog, Warning, TEXT("GetFriendsList Failed to get LocalPlayer!"));
-		return;
-	}
-
-
-	TArray< TSharedRef<FOnlineFriend> > FriendList;
-	if (FriendsInterface->GetFriendsList(Player->GetControllerId(), EFriendsLists::ToString((EFriendsLists::Default)), FriendList))
-	{
-		for (int32 i = 0; i < FriendList.Num(); i++)
-		{
-			FBPFriendInfo BPF;
-			const FOnlineUserPresence& pres = FriendList[i]->GetPresence();
-
-			BPF.OnlineState = ((EBPOnlinePresenceState)((int32)pres.Status.State));
-			BPF.DisplayName = FriendList[i]->GetDisplayName();
-			BPF.RealName = FriendList[i]->GetRealName();
-			BPF.UniqueNetId.SetUniqueNetId(FriendList[i]->GetUserId());
-			BPF.bIsPlayingSameGame = pres.bIsPlayingThisGame;
-
-			BPF.PresenceInfo.bIsOnline = pres.bIsOnline;
-			BPF.PresenceInfo.bHasVoiceSupport = pres.bHasVoiceSupport;
-			BPF.PresenceInfo.bIsPlaying = pres.bIsPlaying;
-			BPF.PresenceInfo.PresenceState = ((EBPOnlinePresenceState)((int32)pres.Status.State));
-			// #TODO: Check back in on this in shipping, epic is missing the UTF8_TO_TCHAR call on converting this and its making an invalid string
-			//BPF.PresenceInfo.StatusString = pres.Status.StatusStr;
-			BPF.PresenceInfo.bIsJoinable = pres.bIsJoinable;
-			BPF.PresenceInfo.bIsPlayingThisGame = pres.bIsPlayingThisGame;
-
-			FriendsList.Add(BPF);
-		}
-
-		return;
-	}
-
-	UE_LOG(AdvancedFriendsLog, Warning, TEXT("GetFriendsList Failed to get any friends!"));
-	return;
-}

Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedIdentityLibrary.cpp

@@ -1,271 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-#include "AdvancedIdentityLibrary.h"
-
-//General Log
-DEFINE_LOG_CATEGORY(AdvancedIdentityLog);
-
-
-void UAdvancedIdentityLibrary::GetPlayerAuthToken(UObject* WorldContextObject, APlayerController * PlayerController, FString & AuthToken, EBlueprintResultSwitch &Result)
-{
-	if (!PlayerController)
-	{
-		UE_LOG(AdvancedIdentityLog, Warning, TEXT("GetPlayerAuthToken was passed a bad player controller!"));
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	ULocalPlayer* Player = Cast<ULocalPlayer>(PlayerController->Player);
-
-	if (!Player)
-	{
-		UE_LOG(AdvancedIdentityLog, Warning, TEXT("GetPlayerAuthToken failed to get LocalPlayer!"));
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	IOnlineIdentityPtr IdentityInterface = Online::GetIdentityInterface(World);
-
-	if (!IdentityInterface.IsValid())
-	{
-		UE_LOG(AdvancedIdentityLog, Warning, TEXT("GetPlayerAuthToken Failed to get identity interface!"));
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	AuthToken = IdentityInterface->GetAuthToken(Player->GetControllerId());
-	Result = EBlueprintResultSwitch::OnSuccess;
-}
-
-void UAdvancedIdentityLibrary::GetPlayerNickname(UObject* WorldContextObject, const FBPUniqueNetId & UniqueNetID, FString & PlayerNickname)
-{ 
-	if (!UniqueNetID.IsValid())
-	{
-		UE_LOG(AdvancedIdentityLog, Warning, TEXT("GetPlayerNickname was passed a bad player uniquenetid!"));
-		return;
-	}
-
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		return;
-	}
-
-	IOnlineIdentityPtr IdentityInterface = Online::GetIdentityInterface(World);
-
-	if (!IdentityInterface.IsValid())
-	{
-		UE_LOG(AdvancedIdentityLog, Warning, TEXT("GetPlayerNickname Failed to get identity interface!"));
-		return;
-	}
-	PlayerNickname = IdentityInterface->GetPlayerNickname(*UniqueNetID.GetUniqueNetId());
-}
-
-
-void UAdvancedIdentityLibrary::GetLoginStatus(UObject* WorldContextObject, const FBPUniqueNetId & UniqueNetID, EBPLoginStatus & LoginStatus, EBlueprintResultSwitch &Result)
-{
-	if (!UniqueNetID.IsValid())
-	{
-		UE_LOG(AdvancedIdentityLog, Warning, TEXT("GetLoginStatus was passed a bad player uniquenetid!"));
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	IOnlineIdentityPtr IdentityInterface = Online::GetIdentityInterface(World);
-
-	if (!IdentityInterface.IsValid())
-	{
-		UE_LOG(AdvancedIdentityLog, Warning, TEXT("GetLoginStatus Failed to get identity interface!"));
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	LoginStatus = (EBPLoginStatus)IdentityInterface->GetLoginStatus(*UniqueNetID.GetUniqueNetId());
-	Result = EBlueprintResultSwitch::OnSuccess;
-}
-
-
-void UAdvancedIdentityLibrary::GetAllUserAccounts(UObject* WorldContextObject, 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);
-
-	if (!IdentityInterface.IsValid())
-	{
-		UE_LOG(AdvancedIdentityLog, Warning, TEXT("GetAllUserAccounts Failed to get identity interface!"));
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	TArray<TSharedPtr<FUserOnlineAccount>> accountInfos = IdentityInterface->GetAllUserAccounts();
-
-	for (int i = 0; i < accountInfos.Num(); ++i)
-	{
-		AccountInfos.Add(FBPUserOnlineAccount(accountInfos[i]));
-	}
-
-	Result = EBlueprintResultSwitch::OnSuccess;
-}
-
-void UAdvancedIdentityLibrary::GetUserAccount(UObject* WorldContextObject, 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);
-
-	if(!UniqueNetId.IsValid())
-	{
-		UE_LOG(AdvancedIdentityLog, Warning, TEXT("GetUserAccount was passed a bad unique net id!"));
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	if (!IdentityInterface.IsValid())
-	{
-		UE_LOG(AdvancedIdentityLog, Warning, TEXT("GetUserAccount Failed to get identity interface!"));
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	TSharedPtr<FUserOnlineAccount> accountInfo = IdentityInterface->GetUserAccount(*UniqueNetId.GetUniqueNetId());
-
-	if (!accountInfo.IsValid())
-	{
-		UE_LOG(AdvancedIdentityLog, Warning, TEXT("GetUserAccount Failed to get the account!"));
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	AccountInfo.UserAccountInfo = accountInfo;
-	Result = EBlueprintResultSwitch::OnSuccess;
-}
-
-void UAdvancedIdentityLibrary::GetUserAccountAccessToken(const FBPUserOnlineAccount & AccountInfo, FString & AccessToken)
-{
-	if (!AccountInfo.UserAccountInfo.IsValid())
-	{
-		UE_LOG(AdvancedIdentityLog, Warning, TEXT("GetUserAccountAccessToken was passed an invalid account!"));
-		return;
-	}
-
-	AccessToken = AccountInfo.UserAccountInfo->GetAccessToken();
-}
-
-void UAdvancedIdentityLibrary::GetUserAccountAuthAttribute(const FBPUserOnlineAccount & AccountInfo, const FString & AttributeName, FString & AuthAttribute, EBlueprintResultSwitch &Result)
-{
-	if (!AccountInfo.UserAccountInfo.IsValid())
-	{
-		UE_LOG(AdvancedIdentityLog, Warning, TEXT("GetUserAccountAuthAttribute was passed an invalid account!"));
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	if (!AccountInfo.UserAccountInfo->GetAuthAttribute(AttributeName, AuthAttribute))
-	{
-		UE_LOG(AdvancedIdentityLog, Warning, TEXT("GetUserAccountAuthAttribute couldn't find the attribute!"));
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	Result = EBlueprintResultSwitch::OnSuccess;
-}
-
-void UAdvancedIdentityLibrary::SetUserAccountAttribute(const FBPUserOnlineAccount & AccountInfo, const FString & AttributeName, const FString & NewAttributeValue, EBlueprintResultSwitch &Result)
-{
-	if (!AccountInfo.UserAccountInfo.IsValid())
-	{
-		UE_LOG(AdvancedIdentityLog, Warning, TEXT("SetUserAccountAuthAttribute was passed an invalid account!"));
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	if (!AccountInfo.UserAccountInfo->SetUserAttribute(AttributeName, NewAttributeValue))
-	{
-		UE_LOG(AdvancedIdentityLog, Warning, TEXT("SetUserAccountAuthAttribute was unable to set the attribute!"));
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	Result = EBlueprintResultSwitch::OnSuccess;
-}
-
-void UAdvancedIdentityLibrary::GetUserID(const FBPUserOnlineAccount & AccountInfo, FBPUniqueNetId & UniqueNetID)
-{
-	if (!AccountInfo.UserAccountInfo.IsValid())
-	{
-		UE_LOG(AdvancedIdentityLog, Warning, TEXT("GetUserID was passed an invalid account!"));
-		return;
-	}
-
-	
-	UniqueNetID.SetUniqueNetId(AccountInfo.UserAccountInfo->GetUserId());
-}
-
-void UAdvancedIdentityLibrary::GetUserAccountRealName(const FBPUserOnlineAccount & AccountInfo, FString & UserName)
-{
-	if (!AccountInfo.UserAccountInfo.IsValid())
-	{
-		UE_LOG(AdvancedIdentityLog, Warning, TEXT("GetUserAccountRealName was passed an invalid account!"));
-		return;
-	}
-
-
-	UserName = AccountInfo.UserAccountInfo->GetRealName();
-}
-
-void UAdvancedIdentityLibrary::GetUserAccountDisplayName(const FBPUserOnlineAccount & AccountInfo, FString & DisplayName)
-{
-	if (!AccountInfo.UserAccountInfo.IsValid())
-	{
-		UE_LOG(AdvancedIdentityLog, Warning, TEXT("GetUserAccountDisplayName was passed an invalid account!"));
-		return;
-	}
-
-
-	DisplayName = AccountInfo.UserAccountInfo->GetDisplayName();
-}
-
-void UAdvancedIdentityLibrary::GetUserAccountAttribute(const FBPUserOnlineAccount & AccountInfo, const FString & AttributeName, FString & AttributeValue, EBlueprintResultSwitch &Result)
-{
-	if (!AccountInfo.UserAccountInfo.IsValid())
-	{
-		UE_LOG(AdvancedIdentityLog, Warning, TEXT("GetUserAccountAttribute was passed an invalid account!"));
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	if (!AccountInfo.UserAccountInfo->GetUserAttribute(AttributeName, AttributeValue))
-	{
-		UE_LOG(AdvancedIdentityLog, Warning, TEXT("GetUserAccountAttribute failed to get user attribute!"));
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	Result = EBlueprintResultSwitch::OnSuccess;
-}

Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedSessions.cpp

@@ -1,12 +0,0 @@
-//#include "StandAlonePrivatePCH.h"
-#include "AdvancedSessions.h"
-
-void AdvancedSessions::StartupModule()
-{
-}
- 
-void AdvancedSessions::ShutdownModule()
-{
-}
- 
-IMPLEMENT_MODULE(AdvancedSessions, AdvancedSessions)

Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedSessionsLibrary.cpp

@@ -1,552 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-#include "AdvancedSessionsLibrary.h"
-#include "GameFramework/PlayerState.h"
-#include "GameFramework/GameStateBase.h"
-
-//General Log
-DEFINE_LOG_CATEGORY(AdvancedSessionsLog);
-
-
-bool UAdvancedSessionsLibrary::KickPlayer(UObject* WorldContextObject, APlayerController* PlayerToKick, FText KickReason)
-{
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-
-	if (World)
-	{
-		if (AGameModeBase* GameMode = World->GetAuthGameMode())
-		{
-			if (GameMode->GameSession)
-			{
-				return GameMode->GameSession->KickPlayer(PlayerToKick, KickReason);
-			}
-		}
-	}
-
-	return false;
-}
-
-bool UAdvancedSessionsLibrary::BanPlayer(UObject* WorldContextObject, APlayerController* PlayerToBan, FText BanReason)
-{
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-
-	if (World)
-	{
-		if (AGameModeBase* GameMode = World->GetAuthGameMode())
-		{
-			if (GameMode->GameSession)
-			{
-				return GameMode->GameSession->BanPlayer(PlayerToBan, BanReason);
-			}
-		}
-	}
-
-	return false;
-}
-
-bool UAdvancedSessionsLibrary::IsValidSession(const FBlueprintSessionResult & SessionResult)
-{
-	return SessionResult.OnlineResult.IsValid();
-}
-
-void UAdvancedSessionsLibrary::GetSessionID_AsString(const FBlueprintSessionResult & SessionResult, FString& SessionID)
-{
-	const TSharedPtr<class FOnlineSessionInfo> SessionInfo = SessionResult.OnlineResult.Session.SessionInfo;
-	if (SessionInfo.IsValid() && SessionInfo->IsValid() && SessionInfo->GetSessionId().IsValid())
-	{
-		SessionID = SessionInfo->GetSessionId().ToString();
-		return;
-	}
-
-	// Zero the string out if we didn't have a valid one, in case this is called in c++
-	SessionID.Empty();
-}
-
-void UAdvancedSessionsLibrary::GetCurrentSessionID_AsString(UObject* WorldContextObject, FString& SessionID)
-{
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	IOnlineSessionPtr SessionInterface = Online::GetSessionInterface(World);
-
-	if (!SessionInterface.IsValid()) 
-	{
-		UE_LOG(AdvancedSessionsLog, Warning, TEXT("GetCurrentSessionID_AsString couldn't get the session interface!"));
-		SessionID.Empty();
-		return;
-	}
-
-	const FNamedOnlineSession* Session = SessionInterface->GetNamedSession(NAME_GameSession);
-	if (Session != nullptr) 
-	{
-		const TSharedPtr<class FOnlineSessionInfo> SessionInfo = Session->SessionInfo;
-		if (SessionInfo.IsValid() && SessionInfo->IsValid() && SessionInfo->GetSessionId().IsValid()) 
-		{
-			SessionID = SessionInfo->GetSessionId().ToString();
-			return;
-		}
-	}
-
-	// Zero the string out if we didn't have a valid one, in case this is called in c++
-	SessionID.Empty();
-}
-
-void UAdvancedSessionsLibrary::GetCurrentUniqueBuildID(int32 &UniqueBuildId)
-{
-	UniqueBuildId = GetBuildUniqueId();
-}
-
-void UAdvancedSessionsLibrary::GetUniqueBuildID(FBlueprintSessionResult SessionResult, int32 &UniqueBuildId)
-{
-	UniqueBuildId = SessionResult.OnlineResult.Session.SessionSettings.BuildUniqueId;
-}
-
-FName UAdvancedSessionsLibrary::GetSessionPropertyKey(const FSessionPropertyKeyPair& SessionProperty)
-{
-	return SessionProperty.Key;
-}
-
-void UAdvancedSessionsLibrary::FindSessionPropertyByName(const TArray<FSessionPropertyKeyPair>& ExtraSettings, FName SettingName, EBlueprintResultSwitch &Result, FSessionPropertyKeyPair& OutProperty)
-{
-	const FSessionPropertyKeyPair* prop = ExtraSettings.FindByPredicate([&](const FSessionPropertyKeyPair& it) {return it.Key == SettingName; });
-	if (prop)
-	{
-		Result = EBlueprintResultSwitch::OnSuccess;
-		OutProperty = *prop;
-		return;
-	}
-
-	Result = EBlueprintResultSwitch::OnFailure;
-}
-
-void UAdvancedSessionsLibrary::FindSessionPropertyIndexByName(const TArray<FSessionPropertyKeyPair>& ExtraSettings, FName SettingName, EBlueprintResultSwitch &Result, int32& OutIndex)
-{
-	OutIndex = ExtraSettings.IndexOfByPredicate([&](const FSessionPropertyKeyPair& it) {return it.Key == SettingName; });
-
-	Result = OutIndex != INDEX_NONE ? EBlueprintResultSwitch::OnSuccess : EBlueprintResultSwitch::OnFailure;
-}	
-
-void UAdvancedSessionsLibrary::AddOrModifyExtraSettings(UPARAM(ref) TArray<FSessionPropertyKeyPair> & SettingsArray, UPARAM(ref) TArray<FSessionPropertyKeyPair> & NewOrChangedSettings, TArray<FSessionPropertyKeyPair> & ModifiedSettingsArray)
-{
-	ModifiedSettingsArray = SettingsArray;
-
-	bool bFoundSetting = false;
-	// For each new setting
-	for (const FSessionPropertyKeyPair& Setting : NewOrChangedSettings)
-	{
-		bFoundSetting = false;
-
-		for (FSessionPropertyKeyPair & itr : ModifiedSettingsArray)
-		{
-			// Manually comparing the keys
-			if (itr.Key == Setting.Key)
-			{
-				bFoundSetting = true;
-				itr.Data = Setting.Data;
-			}
-		}
-
-		// If it was not found, add to the array instead
-		if (!bFoundSetting)
-		{
-			ModifiedSettingsArray.Add(Setting);
-		}
-	}
-
-}
-
-void UAdvancedSessionsLibrary::GetExtraSettings(FBlueprintSessionResult SessionResult, TArray<FSessionPropertyKeyPair> & ExtraSettings)
-{
-	FSessionPropertyKeyPair NewSetting;
-	for (auto& Elem : SessionResult.OnlineResult.Session.SessionSettings.Settings)
-	{
-		NewSetting.Key = Elem.Key;
-		NewSetting.Data = Elem.Value.Data;
-		ExtraSettings.Add(NewSetting);
-	}
-}
-
-void UAdvancedSessionsLibrary::GetSessionState(UObject* WorldContextObject, EBPOnlineSessionState &SessionState)
-{
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	IOnlineSessionPtr SessionInterface = Online::GetSessionInterface(World);
-
-	if (!SessionInterface.IsValid())
-	{
-		UE_LOG(AdvancedSessionsLog, Warning, TEXT("GetSessionState couldn't get the session interface!"));
-		return;
-	}
-
-	SessionState = ((EBPOnlineSessionState)SessionInterface->GetSessionState(NAME_GameSession));
-}
-
-void UAdvancedSessionsLibrary::GetSessionSettings(UObject* WorldContextObject, int32 &NumConnections, int32 &NumPrivateConnections, bool &bIsLAN, bool &bIsDedicated, bool &bAllowInvites, bool &bAllowJoinInProgress, bool &bIsAnticheatEnabled, int32 &BuildUniqueID, TArray<FSessionPropertyKeyPair> &ExtraSettings, EBlueprintResultSwitch &Result)
-{
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	IOnlineSessionPtr SessionInterface = Online::GetSessionInterface(World);
-
-	if (!SessionInterface.IsValid())
-	{
-		UE_LOG(AdvancedSessionsLog, Warning, TEXT("GetSessionSettings couldn't get the session interface!"));
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	FOnlineSessionSettings* settings = SessionInterface->GetSessionSettings(NAME_GameSession);
-	if (!settings)
-	{
-		UE_LOG(AdvancedSessionsLog, Warning, TEXT("GetSessionSettings couldn't get the session settings!"));
-		Result = EBlueprintResultSwitch::OnFailure;
-		return;
-	}
-
-	BuildUniqueID = settings->BuildUniqueId;
-	NumConnections = settings->NumPublicConnections;
-	NumPrivateConnections = settings->NumPrivateConnections;
-	bIsLAN = settings->bIsLANMatch;
-	bIsDedicated = settings->bIsDedicated;
-	bIsAnticheatEnabled = settings->bAntiCheatProtected;
-	bAllowInvites = settings->bAllowInvites;
-	bAllowJoinInProgress = settings->bAllowJoinInProgress;
-
-	FSessionPropertyKeyPair NewSetting;
-
-	for (auto& Elem : settings->Settings)
-	{
-		NewSetting.Key = Elem.Key;
-		NewSetting.Data = Elem.Value.Data;
-		ExtraSettings.Add(NewSetting);
-	}
-
-	Result = EBlueprintResultSwitch::OnSuccess;
-}
-
-void UAdvancedSessionsLibrary::IsPlayerInSession(UObject* WorldContextObject, const FBPUniqueNetId &PlayerToCheck, bool &bIsInSession)
-{
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	IOnlineSessionPtr SessionInterface = Online::GetSessionInterface(World);
-
-	if (!SessionInterface.IsValid())
-	{
-		UE_LOG(AdvancedSessionsLog, Warning, TEXT("IsPlayerInSession couldn't get the session interface!"));
-		bIsInSession = false;
-		return;
-	}
-
-	bIsInSession = SessionInterface->IsPlayerInSession(NAME_GameSession, *PlayerToCheck.GetUniqueNetId());
-}
-
-FSessionsSearchSetting UAdvancedSessionsLibrary::MakeLiteralSessionSearchProperty(FSessionPropertyKeyPair SessionSearchProperty, EOnlineComparisonOpRedux ComparisonOp)
-{
-	FSessionsSearchSetting setting;
-	setting.PropertyKeyPair = SessionSearchProperty;
-	setting.ComparisonOp = ComparisonOp;
-
-	return setting;
-}
-
-FSessionPropertyKeyPair UAdvancedSessionsLibrary::MakeLiteralSessionPropertyByte(FName Key, uint8 Value)
-{
-	FSessionPropertyKeyPair Prop;
-	Prop.Key = Key;
-	Prop.Data.SetValue((int32)Value);
-	return Prop;
-}
-
-FSessionPropertyKeyPair UAdvancedSessionsLibrary::MakeLiteralSessionPropertyBool(FName Key, bool Value)
-{
-	FSessionPropertyKeyPair Prop;
-	Prop.Key = Key;
-	Prop.Data.SetValue(Value);
-	return Prop;
-}
-
-FSessionPropertyKeyPair UAdvancedSessionsLibrary::MakeLiteralSessionPropertyString(FName Key, FString Value)
-{
-	FSessionPropertyKeyPair Prop;
-	Prop.Key = Key;
-	Prop.Data.SetValue(Value);
-	return Prop;
-}
-
-FSessionPropertyKeyPair UAdvancedSessionsLibrary::MakeLiteralSessionPropertyInt(FName Key, int32 Value)
-{
-	FSessionPropertyKeyPair Prop;
-	Prop.Key = Key;
-	Prop.Data.SetValue(Value);
-	return Prop;
-}
-
-FSessionPropertyKeyPair UAdvancedSessionsLibrary::MakeLiteralSessionPropertyFloat(FName Key, float Value)
-{
-	FSessionPropertyKeyPair Prop;
-	Prop.Key = Key;
-	Prop.Data.SetValue(Value);
-	return Prop;
-}
-
-void UAdvancedSessionsLibrary::GetSessionPropertyByte(const TArray<FSessionPropertyKeyPair> & ExtraSettings, FName SettingName, ESessionSettingSearchResult &SearchResult, uint8 &SettingValue)
-{
-	for (FSessionPropertyKeyPair itr : ExtraSettings)
-	{
-		if (itr.Key == SettingName)
-		{
-			if (itr.Data.GetType() == EOnlineKeyValuePairDataType::Int32)
-			{
-				int32 Val;
-				itr.Data.GetValue(Val);
-				SettingValue = (uint8)(Val);
-				SearchResult = ESessionSettingSearchResult::Found;
-			}
-			else
-			{
-				SearchResult = ESessionSettingSearchResult::WrongType;
-			}
-			return;
-		}
-	}
-
-	SearchResult = ESessionSettingSearchResult::NotFound;
-	return;
-}
-
-void UAdvancedSessionsLibrary::GetSessionPropertyBool(const TArray<FSessionPropertyKeyPair> & ExtraSettings, FName SettingName, ESessionSettingSearchResult &SearchResult, bool &SettingValue)
-{
-	for (FSessionPropertyKeyPair itr : ExtraSettings)
-	{
-		if (itr.Key == SettingName)
-		{
-			if (itr.Data.GetType() == EOnlineKeyValuePairDataType::Bool)
-			{
-				itr.Data.GetValue(SettingValue);
-				SearchResult = ESessionSettingSearchResult::Found;
-			}
-			else
-			{
-				SearchResult = ESessionSettingSearchResult::WrongType;
-			}
-			return;
-		}
-	}
-
-	SearchResult = ESessionSettingSearchResult::NotFound;
-	return;
-}
-
-void UAdvancedSessionsLibrary::GetSessionPropertyString(const TArray<FSessionPropertyKeyPair> & ExtraSettings, FName SettingName, ESessionSettingSearchResult &SearchResult, FString &SettingValue)
-{
-	for (FSessionPropertyKeyPair itr : ExtraSettings)
-	{
-		if (itr.Key == SettingName)
-		{
-			if (itr.Data.GetType() == EOnlineKeyValuePairDataType::String)
-			{
-				itr.Data.GetValue(SettingValue);
-				SearchResult = ESessionSettingSearchResult::Found;
-			}
-			else
-			{
-				SearchResult = ESessionSettingSearchResult::WrongType;
-			}
-			return;
-		}
-	}
-
-	SearchResult = ESessionSettingSearchResult::NotFound;
-	return;
-}
-
-void UAdvancedSessionsLibrary::GetSessionPropertyInt(const TArray<FSessionPropertyKeyPair> & ExtraSettings, FName SettingName, ESessionSettingSearchResult &SearchResult, int32 &SettingValue)
-{
-	for (FSessionPropertyKeyPair itr : ExtraSettings)
-	{
-		if (itr.Key == SettingName)
-		{
-			if (itr.Data.GetType() == EOnlineKeyValuePairDataType::Int32)
-			{
-				itr.Data.GetValue(SettingValue);
-				SearchResult = ESessionSettingSearchResult::Found;
-			}
-			else
-			{
-				SearchResult = ESessionSettingSearchResult::WrongType;
-			}
-			return;
-		}
-	}
-
-	SearchResult = ESessionSettingSearchResult::NotFound;
-	return;
-}
-
-void UAdvancedSessionsLibrary::GetSessionPropertyFloat(const TArray<FSessionPropertyKeyPair> & ExtraSettings, FName SettingName, ESessionSettingSearchResult &SearchResult, float &SettingValue)
-{
-	for (FSessionPropertyKeyPair itr : ExtraSettings)
-	{
-		if (itr.Key == SettingName)
-		{
-			if (itr.Data.GetType() == EOnlineKeyValuePairDataType::Float)
-			{
-				itr.Data.GetValue(SettingValue);
-				SearchResult = ESessionSettingSearchResult::Found;
-			}
-			else
-			{
-				SearchResult = ESessionSettingSearchResult::WrongType;
-			}
-			return;
-		}
-	}
-
-	SearchResult = ESessionSettingSearchResult::NotFound;
-	return;
-}
-
-
-bool UAdvancedSessionsLibrary::HasOnlineSubsystem(FName SubSystemName)
-{
-	return IOnlineSubsystem::DoesInstanceExist(SubSystemName);
-}
-
-void UAdvancedSessionsLibrary::GetNetPlayerIndex(APlayerController *PlayerController, int32 &NetPlayerIndex)
-{
-	if (!PlayerController)
-	{
-		UE_LOG(AdvancedSessionsLog, Warning, TEXT("GetNetPlayerIndex received a bad PlayerController!"));
-		NetPlayerIndex = 0;
-		return;
-	}
-
-	NetPlayerIndex = PlayerController->NetPlayerIndex;
-	return;
-}
-
-void UAdvancedSessionsLibrary::UniqueNetIdToString(const FBPUniqueNetId& UniqueNetId, FString &String)
-{
-	const FUniqueNetId * ID = UniqueNetId.GetUniqueNetId();
-
-	if ( !ID )
-	{
-		UE_LOG(AdvancedSessionsLog, Warning, TEXT("UniqueNetIdToString received a bad UniqueNetId!"));
-		String = "ERROR, BAD UNIQUE NET ID";
-	}
-	else
-		String = ID->ToString();
-}
-
-
-void UAdvancedSessionsLibrary::GetUniqueNetID(APlayerController *PlayerController, FBPUniqueNetId &UniqueNetId)
-{
-	if (!PlayerController)
-	{
-		UE_LOG(AdvancedSessionsLog, Warning, TEXT("GetUniqueNetIdFromController received a bad PlayerController!"));
-		return;
-	}
-
-	if (APlayerState* PlayerState = (PlayerController != NULL) ? PlayerController->PlayerState : NULL)
-	{
-		UniqueNetId.SetUniqueNetId(PlayerState->GetUniqueId().GetUniqueNetId());
-		if (!UniqueNetId.IsValid())
-		{
-			UE_LOG(AdvancedSessionsLog, Warning, TEXT("GetUniqueNetIdFromController couldn't get the player uniquenetid!"));
-		}
-		return;
-	}
-}
-
-void UAdvancedSessionsLibrary::GetUniqueNetIDFromPlayerState(APlayerState *PlayerState, FBPUniqueNetId &UniqueNetId)
-{
-	if (!PlayerState)
-	{
-		UE_LOG(AdvancedSessionsLog, Warning, TEXT("GetUniqueNetIdFromPlayerState received a bad PlayerState!"));
-		return;
-	}
-
-	UniqueNetId.SetUniqueNetId(PlayerState->GetUniqueId().GetUniqueNetId());
-	if (!UniqueNetId.IsValid())
-	{
-		UE_LOG(AdvancedSessionsLog, Warning, TEXT("GetUniqueNetIdFromPlayerState couldn't get the player uniquenetid!"));
-	}
-	return;
-}
-
-bool UAdvancedSessionsLibrary::IsValidUniqueNetID(const FBPUniqueNetId &UniqueNetId)
-{
-	return UniqueNetId.IsValid();
-}
-
-bool UAdvancedSessionsLibrary::EqualEqual_UNetIDUnetID(const FBPUniqueNetId &A, const FBPUniqueNetId &B)
-{	
-	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)
-	{
-		UE_LOG(AdvancedSessionsLog, Warning, TEXT("SetLocalPlayerNameFromController Bad Player Controller!"));
-		return;
-	}
-
-	if (APlayerState* PlayerState = (PlayerController != NULL) ? PlayerController->PlayerState : NULL)
-	{
-		PlayerState->SetPlayerName(PlayerName);
-		return;
-	}
-	else
-	{
-		UE_LOG(AdvancedSessionsLog, Warning, TEXT("SetLocalPlayerNameFromController had a bad player state!"));
-	}
-}
-
-void UAdvancedSessionsLibrary::GetPlayerName(APlayerController *PlayerController, FString &PlayerName)
-{
-	if (!PlayerController)
-	{
-		UE_LOG(AdvancedSessionsLog, Warning, TEXT("GetLocalPlayerNameFromController Bad Player Controller!"));
-		return;
-	}
-
-	if (APlayerState* PlayerState = (PlayerController != NULL) ? PlayerController->PlayerState : NULL)
-	{
-		PlayerName = PlayerState->GetPlayerName();
-		return;
-	}
-	else
-	{
-		UE_LOG(AdvancedSessionsLog, Warning, TEXT("GetLocalPlayerNameFromController had a bad player state!"));
-	}
-}
-
-void UAdvancedSessionsLibrary::GetNumberOfNetworkPlayers(UObject* WorldContextObject, int32 &NumNetPlayers)
-{
-	//Get World
-	UWorld* TheWorld = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-
-	if (!TheWorld)
-	{
-		UE_LOG(AdvancedSessionsLog, Warning, TEXT("GetNumberOfNetworkPlayers Failed to get World()!"));
-		return;
-	}
-
-	NumNetPlayers = TheWorld->GetGameState()->PlayerArray.Num();
-}
-
-bool UAdvancedSessionsLibrary::ServerTravel(UObject* WorldContextObject, const FString& FURL, bool bAbsolute, bool bShouldSkipGameNotify)
-{
-	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;
-}

Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedVoiceLibrary.cpp

@@ -1,359 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-#include "AdvancedVoiceLibrary.h"
-
-
-//General Log
-DEFINE_LOG_CATEGORY(AdvancedVoiceLog);
-
-void UAdvancedVoiceLibrary::IsHeadsetPresent(UObject* WorldContextObject, bool & bHasHeadset, uint8 LocalPlayerNum)
-{
-
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		return;
-	}
-
-	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface(World);
-
-	if (!VoiceInterface.IsValid())
-	{
-		bHasHeadset = false;
-		UE_LOG(AdvancedVoiceLog, Warning, TEXT("Check For Headset couldn't get the voice interface!"));
-		return;
-	}
-
-	bHasHeadset = VoiceInterface->IsHeadsetPresent(LocalPlayerNum);
-}
-
-void UAdvancedVoiceLibrary::StartNetworkedVoice(UObject* WorldContextObject, uint8 LocalPlayerNum)
-{
-
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		return;
-	}
-
-	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface(World);
-
-	if (!VoiceInterface.IsValid())
-	{
-		UE_LOG(AdvancedVoiceLog, Warning, TEXT("Start Networked Voice couldn't get the voice interface!"));
-		return;
-	}
-
-	VoiceInterface->StartNetworkedVoice(LocalPlayerNum);
-}
-
-void UAdvancedVoiceLibrary::StopNetworkedVoice(UObject* WorldContextObject, uint8 LocalPlayerNum)
-{
-
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		return;
-	}
-
-	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface(World);
-
-	if (!VoiceInterface.IsValid())
-	{
-		UE_LOG(AdvancedVoiceLog, Warning, TEXT("Start Networked Voice couldn't get the voice interface!"));
-		return;
-	}
-
-	VoiceInterface->StopNetworkedVoice(LocalPlayerNum);
-}
-
-bool UAdvancedVoiceLibrary::RegisterLocalTalker(UObject* WorldContextObject, uint8 LocalPlayerNum)
-{
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		return false;
-	}
-
-	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface(World);
-
-	if (!VoiceInterface.IsValid())
-	{
-		UE_LOG(AdvancedVoiceLog, Warning, TEXT("Register Local Talker couldn't get the voice interface!"));
-		return false;
-	}
-
-	return VoiceInterface->RegisterLocalTalker(LocalPlayerNum);
-}
-
-void UAdvancedVoiceLibrary::RegisterAllLocalTalkers(UObject* WorldContextObject)
-{
-
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		return;
-	}
-
-	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface(World);
-
-	if (!VoiceInterface.IsValid())
-	{
-		UE_LOG(AdvancedVoiceLog, Warning, TEXT("Register Local Talkers couldn't get the voice interface!"));
-		return;
-	}
-
-	VoiceInterface->RegisterLocalTalkers();
-}
-
-
-void UAdvancedVoiceLibrary::UnRegisterLocalTalker(UObject* WorldContextObject, uint8 LocalPlayerNum)
-{
-
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		return;
-	}
-
-	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface(World);
-
-	if (!VoiceInterface.IsValid())
-	{
-		UE_LOG(AdvancedVoiceLog, Warning, TEXT("Unregister Local Talker couldn't get the voice interface!"));
-		return;
-	}
-
-	VoiceInterface->UnregisterLocalTalker(LocalPlayerNum);
-}
-
-void UAdvancedVoiceLibrary::UnRegisterAllLocalTalkers(UObject* WorldContextObject)
-{
-
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		return;
-	}
-
-	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface(World);
-
-	if (!VoiceInterface.IsValid())
-	{
-		UE_LOG(AdvancedVoiceLog, Warning, TEXT("UnRegister All Local Talkers couldn't get the voice interface!"));
-		return;
-	}
-
-	VoiceInterface->UnregisterLocalTalkers();
-}
-
-bool UAdvancedVoiceLibrary::RegisterRemoteTalker(UObject* WorldContextObject, const FBPUniqueNetId& UniqueNetId)
-{
-	if (!UniqueNetId.IsValid())
-	{
-		UE_LOG(AdvancedVoiceLog, Warning, TEXT("Register Remote Talker was passed an invalid unique net id!"));
-		return false;
-	}
-
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		return false;
-	}
-
-	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface(World);
-
-	if (!VoiceInterface.IsValid())
-	{
-		UE_LOG(AdvancedVoiceLog, Warning, TEXT("Register Remote Talker couldn't get the voice interface!"));
-		return false;
-	}
-
-	return VoiceInterface->RegisterRemoteTalker(*UniqueNetId.GetUniqueNetId());
-}
-
-bool UAdvancedVoiceLibrary::UnRegisterRemoteTalker(UObject* WorldContextObject, const FBPUniqueNetId& UniqueNetId)
-{
-	if (!UniqueNetId.IsValid())
-	{
-		UE_LOG(AdvancedVoiceLog, Warning, TEXT("UnRegister Remote Talker was passed an invalid unique net id!"));
-		return false;
-	}
-
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		return false;
-	}
-
-	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface(World);
-
-	if (!VoiceInterface.IsValid())
-	{
-		UE_LOG(AdvancedVoiceLog, Warning, TEXT("UnRegister Remote Talker couldn't get the voice interface!"));
-		return false;
-	}
-
-	return VoiceInterface->UnregisterRemoteTalker(*UniqueNetId.GetUniqueNetId());
-}
-
-void UAdvancedVoiceLibrary::RemoveAllRemoteTalkers(UObject* WorldContextObject)
-{
-
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		return;
-	}
-
-	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface(World);
-
-	if (!VoiceInterface.IsValid())
-	{
-		UE_LOG(AdvancedVoiceLog, Warning, TEXT("Remove All Remote Talkers couldn't get the voice interface!"));
-		return;
-	}
-
-	VoiceInterface->RemoveAllRemoteTalkers();
-}
-
-bool UAdvancedVoiceLibrary::IsLocalPlayerTalking(UObject* WorldContextObject, uint8 LocalPlayerNum)
-{
-
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		return false;
-	}
-
-	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface(World);
-
-	if (!VoiceInterface.IsValid())
-	{
-		UE_LOG(AdvancedVoiceLog, Warning, TEXT("Is Local Player Talking couldn't get the voice interface!"));
-		return false;
-	}
-
-	return VoiceInterface->IsLocalPlayerTalking(LocalPlayerNum);
-}
-
-bool UAdvancedVoiceLibrary::IsRemotePlayerTalking(UObject* WorldContextObject, const FBPUniqueNetId& UniqueNetId)
-{
-	if (!UniqueNetId.IsValid())
-	{
-		UE_LOG(AdvancedVoiceLog, Warning, TEXT("Is Remote Player Talking was passed an invalid unique net id!"));
-		return false;
-	}
-
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		return false;
-	}
-
-	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface(World);
-
-	if (!VoiceInterface.IsValid())
-	{
-		UE_LOG(AdvancedVoiceLog, Warning, TEXT("Is Remote Player Talking couldn't get the voice interface!"));
-		return false;
-	}
-
-	return VoiceInterface->IsRemotePlayerTalking(*UniqueNetId.GetUniqueNetId());
-}
-
-bool UAdvancedVoiceLibrary::IsPlayerMuted(UObject* WorldContextObject, uint8 LocalUserNumChecking, const FBPUniqueNetId& UniqueNetId)
-{
-	if (!UniqueNetId.IsValid())
-	{
-		UE_LOG(AdvancedVoiceLog, Warning, TEXT("Is Player Muted was passed an invalid unique net id!"));
-		return false;
-	}
-
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		return false;
-	}
-
-	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface(World);
-
-	if (!VoiceInterface.IsValid())
-	{
-		UE_LOG(AdvancedVoiceLog, Warning, TEXT("Is Player Muted couldn't get the voice interface!"));
-		return false;
-	}
-
-	return VoiceInterface->IsMuted(LocalUserNumChecking, *UniqueNetId.GetUniqueNetId());
-}
-
-bool UAdvancedVoiceLibrary::MuteRemoteTalker(UObject* WorldContextObject, uint8 LocalUserNum, const FBPUniqueNetId& UniqueNetId, bool bIsSystemWide)
-{
-	if (!UniqueNetId.IsValid())
-	{
-		UE_LOG(AdvancedVoiceLog, Warning, TEXT("Mute Remote Talker was passed an invalid unique net id!"));
-		return false;
-	}
-
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		return false;
-	}
-
-	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface(World);
-
-	if (!VoiceInterface.IsValid())
-	{
-		UE_LOG(AdvancedVoiceLog, Warning, TEXT("Mute Remote Talker couldn't get the voice interface!"));
-		return false;
-	}
-
-	return VoiceInterface->MuteRemoteTalker(LocalUserNum, *UniqueNetId.GetUniqueNetId(), bIsSystemWide);
-}
-
-bool UAdvancedVoiceLibrary::UnMuteRemoteTalker(UObject* WorldContextObject, uint8 LocalUserNum, const FBPUniqueNetId& UniqueNetId, bool bIsSystemWide)
-{
-	if (!UniqueNetId.IsValid())
-	{
-		UE_LOG(AdvancedVoiceLog, Warning, TEXT("Unmute Remote Talker was passed an invalid unique net id!"));
-		return false;
-	}
-
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		return false;
-	}
-
-	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface(World);
-
-	if (!VoiceInterface.IsValid())
-	{
-		UE_LOG(AdvancedVoiceLog, Warning, TEXT("Unmute Remote Talker couldn't get the voice interface!"));
-		return false;
-	}
-
-	return VoiceInterface->UnmuteRemoteTalker(LocalUserNum, *UniqueNetId.GetUniqueNetId(), bIsSystemWide);
-}
-
-
-void UAdvancedVoiceLibrary::GetNumLocalTalkers(UObject* WorldContextObject, int32 & NumLocalTalkers)
-{
-
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	if (!IsValid(World))
-	{
-		return;
-	}
-
-	IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface(World);
-
-	if (!VoiceInterface.IsValid())
-	{
-		NumLocalTalkers = 0;
-		UE_LOG(AdvancedVoiceLog, Warning, TEXT("Unmute Remote Talker couldn't get the voice interface!"));
-		return;
-	}
-
-	NumLocalTalkers = VoiceInterface->GetNumLocalTalkers();
-}

Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AutoLoginUserCallbackProxy.cpp

@@ -1,89 +0,0 @@
-// Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
-
-#include "AutoLoginUserCallbackProxy.h"
-#include "Kismet/GameplayStatics.h"
-
-#include "Online.h"
-
-//////////////////////////////////////////////////////////////////////////
-// ULoginUserCallbackProxy
-
-UAutoLoginUserCallbackProxy::UAutoLoginUserCallbackProxy(const FObjectInitializer& ObjectInitializer)
-	: Super(ObjectInitializer)
-	, Delegate(FOnLoginCompleteDelegate::CreateUObject(this, &ThisClass::OnCompleted))
-{
-}
-
-UAutoLoginUserCallbackProxy* UAutoLoginUserCallbackProxy::AutoLoginUser(UObject* WorldContextObject, int32 LocalUserNum)
-{
-	UAutoLoginUserCallbackProxy* Proxy = NewObject<UAutoLoginUserCallbackProxy>();
-	Proxy->LocalUserNumber = LocalUserNum;
-	Proxy->WorldContextObject = WorldContextObject;
-	return Proxy;
-}
-
-void UAutoLoginUserCallbackProxy::Activate()
-{
-
-	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("AutoLoginUser"), GEngine->GetWorldFromContextObject(WorldContextObject.Get(), EGetWorldErrorMode::LogAndReturnNull));
-	
-	if (Helper.OnlineSub != nullptr)
-	{
-		auto Identity = Helper.OnlineSub->GetIdentityInterface();
-
-		if (Identity.IsValid())
-		{
-			DelegateHandle = Identity->AddOnLoginCompleteDelegate_Handle(LocalUserNumber, Delegate);
-			Identity->AutoLogin(LocalUserNumber);
-			return;
-		}
-	}
-
-	// Fail immediately
-	OnFailure.Broadcast();
-}
-
-void UAutoLoginUserCallbackProxy::OnCompleted(int32 LocalUserNum, bool bWasSuccessful, const FUniqueNetId& UserId, const FString& ErrorVal)
-{
-	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("AutoLoginUser"), GEngine->GetWorldFromContextObject(WorldContextObject.Get(), EGetWorldErrorMode::LogAndReturnNull));
-	
-	if (Helper.OnlineSub != nullptr)
-	{
-		auto Identity = Helper.OnlineSub->GetIdentityInterface();
-
-		if (Identity.IsValid())
-		{
-			Identity->ClearOnLoginCompleteDelegate_Handle(LocalUserNum, DelegateHandle);
-		}
-
-		if (APlayerController* PController = UGameplayStatics::GetPlayerController(WorldContextObject->GetWorld(), LocalUserNum))
-		{
-			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();
-		}
-	}
-
-	OnFailure.Broadcast();
-}

Plugins/AdvancedSessions/Source/AdvancedSessions/Private/CancelFindSessionsCallbackProxy.cpp

@@ -1,70 +0,0 @@
-// Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
-#include "CancelFindSessionsCallbackProxy.h"
-
-
-//////////////////////////////////////////////////////////////////////////
-// UCancelFindSessionsCallbackProxy
-
-UCancelFindSessionsCallbackProxy::UCancelFindSessionsCallbackProxy(const FObjectInitializer& ObjectInitializer)
-	: Super(ObjectInitializer)
-	, Delegate(FOnCancelFindSessionsCompleteDelegate::CreateUObject(this, &ThisClass::OnCompleted))
-{
-}
-
-UCancelFindSessionsCallbackProxy* UCancelFindSessionsCallbackProxy::CancelFindSessions(UObject* WorldContextObject, class APlayerController* PlayerController)
-{
-	UCancelFindSessionsCallbackProxy* Proxy = NewObject<UCancelFindSessionsCallbackProxy>();
-	Proxy->PlayerControllerWeakPtr = PlayerController;
-	Proxy->WorldContextObject = WorldContextObject;
-	return Proxy;
-}
-
-void UCancelFindSessionsCallbackProxy::Activate()
-{
-	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("CancelFindSessions"), GEngine->GetWorldFromContextObject(WorldContextObject.Get(), EGetWorldErrorMode::LogAndReturnNull));
-	Helper.QueryIDFromPlayerController(PlayerControllerWeakPtr.Get());
-
-	if (Helper.IsValid())
-	{
-		auto Sessions = Helper.OnlineSub->GetSessionInterface();
-		if (Sessions.IsValid())		
-		{
-			DelegateHandle = Sessions->AddOnCancelFindSessionsCompleteDelegate_Handle(Delegate);
-			Sessions->CancelFindSessions();
-
-			// OnCompleted will get called, nothing more to do now
-			return;
-		}
-		else
-		{
-			FFrame::KismetExecutionMessage(TEXT("Sessions not supported by Online Subsystem"), ELogVerbosity::Warning);
-		}
-	}
-
-	// Fail immediately
-	OnFailure.Broadcast();
-}
-
-void UCancelFindSessionsCallbackProxy::OnCompleted(bool bWasSuccessful)
-{
-	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("CancelFindSessionsCallback"), GEngine->GetWorldFromContextObject(WorldContextObject.Get(), EGetWorldErrorMode::LogAndReturnNull));
-	Helper.QueryIDFromPlayerController(PlayerControllerWeakPtr.Get());
-
-	if (Helper.IsValid())
-	{
-		auto Sessions = Helper.OnlineSub->GetSessionInterface();
-		if (Sessions.IsValid())
-		{
-			Sessions->ClearOnCancelFindSessionsCompleteDelegate_Handle(DelegateHandle);
-		}
-	}
-
-	if (bWasSuccessful)
-	{
-		OnSuccess.Broadcast();
-	}
-	else
-	{
-		OnFailure.Broadcast();
-	}
-}

Plugins/AdvancedSessions/Source/AdvancedSessions/Private/CreateSessionCallbackProxyAdvanced.cpp

@@ -1,182 +0,0 @@
-// Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
-#include "CreateSessionCallbackProxyAdvanced.h"
-
-
-//////////////////////////////////////////////////////////////////////////
-// UCreateSessionCallbackProxyAdvanced
-
-UCreateSessionCallbackProxyAdvanced::UCreateSessionCallbackProxyAdvanced(const FObjectInitializer& ObjectInitializer)
-	: Super(ObjectInitializer)
-	, CreateCompleteDelegate(FOnCreateSessionCompleteDelegate::CreateUObject(this, &ThisClass::OnCreateCompleted))
-	, StartCompleteDelegate(FOnStartSessionCompleteDelegate::CreateUObject(this, &ThisClass::OnStartCompleted))
-	, NumPublicConnections(1)
-{
-}
-
-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;
-	Proxy->NumPublicConnections = PublicConnections;
-	Proxy->NumPrivateConnections = PrivateConnections;
-	Proxy->bUseLAN = bUseLAN;
-	Proxy->WorldContextObject = WorldContextObject;
-	Proxy->bAllowInvites = bAllowInvites;
-	Proxy->ExtraSettings = ExtraSettings;
-	Proxy->bDedicatedServer = bIsDedicatedServer;
-	Proxy->bUsePresence = bUsePresence;
-	Proxy->bUseLobbiesIfAvailable = bUseLobbiesIfAvailable;
-	Proxy->bAllowJoinViaPresence = bAllowJoinViaPresence;
-	Proxy->bAllowJoinViaPresenceFriendsOnly = bAllowJoinViaPresenceFriendsOnly;
-	Proxy->bAntiCheatProtected = bAntiCheatProtected;
-	Proxy->bUsesStats = bUsesStats;
-	Proxy->bShouldAdvertise = bShouldAdvertise;
-	Proxy->bUseLobbiesVoiceChatIfAvailable = bUseLobbiesVoiceChatIfAvailable;
-	Proxy->bStartAfterCreate = bStartAfterCreate;
-	return Proxy;
-}
-
-void UCreateSessionCallbackProxyAdvanced::Activate()
-{
-	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("CreateSession"), GEngine->GetWorldFromContextObject(WorldContextObject.Get(), EGetWorldErrorMode::LogAndReturnNull));
-	
-	if (PlayerControllerWeakPtr.IsValid() )
-		Helper.QueryIDFromPlayerController(PlayerControllerWeakPtr.Get());
-
-	if (Helper.OnlineSub != nullptr)
-	{
-		auto Sessions = Helper.OnlineSub->GetSessionInterface();
-		if (Sessions.IsValid())
-		{
-			CreateCompleteDelegateHandle = Sessions->AddOnCreateSessionCompleteDelegate_Handle(CreateCompleteDelegate);
-			
-			FOnlineSessionSettings Settings;
-			Settings.NumPublicConnections = NumPublicConnections;
-			Settings.NumPrivateConnections = NumPrivateConnections;
-			Settings.bShouldAdvertise = bShouldAdvertise;
-			Settings.bAllowJoinInProgress = true;
-			Settings.bIsLANMatch = bUseLAN;
-			Settings.bAllowJoinViaPresence = bAllowJoinViaPresence;
-			Settings.bIsDedicated = bDedicatedServer;
-
-			if (bDedicatedServer)
-			{
-				Settings.bUsesPresence = false;
-				Settings.bUseLobbiesIfAvailable = false;
-			}
-			else
-			{
-				Settings.bUsesPresence = bUsePresence;
-				Settings.bUseLobbiesIfAvailable = bUseLobbiesIfAvailable;
-			}
-
-			Settings.bUseLobbiesVoiceChatIfAvailable = bUseLobbiesIfAvailable ? bUseLobbiesVoiceChatIfAvailable : false;
-			Settings.bAllowJoinViaPresenceFriendsOnly = bAllowJoinViaPresenceFriendsOnly;
-			Settings.bAntiCheatProtected = bAntiCheatProtected;
-			Settings.bUsesStats = bUsesStats;
-
-			// These are about the only changes over the standard Create Sessions Node
-			Settings.bAllowInvites = bAllowInvites;
-			
-			FOnlineSessionSetting ExtraSetting;
-			for (int i = 0; i < ExtraSettings.Num(); i++)
-			{
-				ExtraSetting.Data = ExtraSettings[i].Data;
-				//	ViaOnlineServiceAndPing
-				ExtraSetting.AdvertisementType = EOnlineDataAdvertisementType::ViaOnlineService;
-				Settings.Settings.Add(ExtraSettings[i].Key, ExtraSetting);
-			}
-			
-			
-			if (!bDedicatedServer )
-			{
-				if (PlayerControllerWeakPtr.IsValid() && Helper.UserID.IsValid())
-				{
-					Sessions->CreateSession(*Helper.UserID, NAME_GameSession, Settings);
-				}
-				else
-				{
-					FFrame::KismetExecutionMessage(TEXT("Invalid Player controller when attempting to start a session"), ELogVerbosity::Warning);
-					Sessions->ClearOnCreateSessionCompleteDelegate_Handle(CreateCompleteDelegateHandle);
-					
-					// Fail immediately
-					OnFailure.Broadcast();
-				}
-			}
-			else
-				Sessions->CreateSession(0, NAME_GameSession, Settings);
-
-			// OnCreateCompleted will get called, nothing more to do now
-			return;
-		}
-		else
-		{
-			FFrame::KismetExecutionMessage(TEXT("Sessions not supported by Online Subsystem"), ELogVerbosity::Warning);
-		}
-	}
-
-	// Fail immediately
-	OnFailure.Broadcast();
-}
-
-void UCreateSessionCallbackProxyAdvanced::OnCreateCompleted(FName SessionName, bool bWasSuccessful)
-{
-	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("CreateSessionCallback"), GEngine->GetWorldFromContextObject(WorldContextObject.Get(), EGetWorldErrorMode::LogAndReturnNull));
-	//Helper.QueryIDFromPlayerController(PlayerControllerWeakPtr.Get());
-
-	if (Helper.OnlineSub != nullptr)
-	{
-		auto Sessions = Helper.OnlineSub->GetSessionInterface();
-		if (Sessions.IsValid())
-		{
-			Sessions->ClearOnCreateSessionCompleteDelegate_Handle(CreateCompleteDelegateHandle);
-			
-			if (bWasSuccessful)
-			{
-				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);
-					Sessions->StartSession(NAME_GameSession); // We'll call `OnSuccess.Broadcast()` when start succeeds.
-				}
-				else
-				{
-					UE_LOG_ONLINE_SESSION(Display, TEXT("Session creation completed. Automatic start is turned off, to start the session call 'StartSession'."));
-					OnSuccess.Broadcast();
-				}
-
-				// OnStartCompleted will get called, nothing more to do now
-				return;
-			}
-		}
-	}
-
-	if (!bWasSuccessful)
-	{
-		OnFailure.Broadcast();
-	}
-}
-
-void UCreateSessionCallbackProxyAdvanced::OnStartCompleted(FName SessionName, bool bWasSuccessful)
-{
-	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("StartSessionCallback"), GEngine->GetWorldFromContextObject(WorldContextObject.Get(), EGetWorldErrorMode::LogAndReturnNull));
-	//Helper.QueryIDFromPlayerController(PlayerControllerWeakPtr.Get());
-
-	if (Helper.OnlineSub != nullptr)
-	{
-		auto Sessions = Helper.OnlineSub->GetSessionInterface();
-		if (Sessions.IsValid())
-		{
-			Sessions->ClearOnStartSessionCompleteDelegate_Handle(StartCompleteDelegateHandle);
-		}
-	}
-
-	if (bWasSuccessful)
-	{
-		OnSuccess.Broadcast();
-	}
-	else
-	{
-		OnFailure.Broadcast();
-	}
-}

Plugins/AdvancedSessions/Source/AdvancedSessions/Private/EndSessionCallbackProxy.cpp

@@ -1,78 +0,0 @@
-// Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
-#include "EndSessionCallbackProxy.h"
-
-
-//////////////////////////////////////////////////////////////////////////
-// UEndSessionCallbackProxy
-
-UEndSessionCallbackProxy::UEndSessionCallbackProxy(const FObjectInitializer& ObjectInitializer)
-	: Super(ObjectInitializer)
-	, Delegate(FOnEndSessionCompleteDelegate::CreateUObject(this, &ThisClass::OnCompleted))
-{
-}
-
-UEndSessionCallbackProxy* UEndSessionCallbackProxy::EndSession(UObject* WorldContextObject, class APlayerController* PlayerController)
-{
-	UEndSessionCallbackProxy* Proxy = NewObject<UEndSessionCallbackProxy>();
-	Proxy->PlayerControllerWeakPtr = PlayerController;
-	Proxy->WorldContextObject = WorldContextObject;
-	return Proxy;
-}
-
-void UEndSessionCallbackProxy::Activate()
-{
-	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("EndSession"), GEngine->GetWorldFromContextObject(WorldContextObject.Get(), EGetWorldErrorMode::LogAndReturnNull));
-	Helper.QueryIDFromPlayerController(PlayerControllerWeakPtr.Get());
-
-	if (Helper.IsValid())
-	{
-		auto Sessions = Helper.OnlineSub->GetSessionInterface();
-		if (Sessions.IsValid())
-		{
-			FNamedOnlineSession* Session = Sessions->GetNamedSession(NAME_GameSession);
-			if (Session &&
-				Session->SessionState == EOnlineSessionState::InProgress)
-			{
-				DelegateHandle = Sessions->AddOnEndSessionCompleteDelegate_Handle(Delegate);
-				Sessions->EndSession(NAME_GameSession);
-			}
-			else
-			{
-				OnSuccess.Broadcast();
-			}
-			// OnCompleted will get called, nothing more to do now
-			return;
-		}
-		else
-		{
-			FFrame::KismetExecutionMessage(TEXT("Sessions not supported by Online Subsystem"), ELogVerbosity::Warning);
-		}
-	}
-
-	// Fail immediately
-	OnFailure.Broadcast();
-}
-
-void UEndSessionCallbackProxy::OnCompleted(FName SessionName, bool bWasSuccessful)
-{
-	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("EndSessionCallback"), GEngine->GetWorldFromContextObject(WorldContextObject.Get(), EGetWorldErrorMode::LogAndReturnNull));
-	Helper.QueryIDFromPlayerController(PlayerControllerWeakPtr.Get());
-
-	if (Helper.IsValid())
-	{
-		auto Sessions = Helper.OnlineSub->GetSessionInterface();
-		if (Sessions.IsValid())
-		{
-			Sessions->ClearOnEndSessionCompleteDelegate_Handle(DelegateHandle);
-		}
-	}
-
-	if (bWasSuccessful)
-	{
-		OnSuccess.Broadcast();
-	}
-	else
-	{
-		OnFailure.Broadcast();
-	}
-}

Plugins/AdvancedSessions/Source/AdvancedSessions/Private/FindFriendSessionCallbackProxy.cpp

@@ -1,130 +0,0 @@
-// Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
-#include "FindFriendSessionCallbackProxy.h"
-
-
-//////////////////////////////////////////////////////////////////////////
-// UGetRecentPlayersCallbackProxy
-DEFINE_LOG_CATEGORY(AdvancedFindFriendSessionLog);
-
-UFindFriendSessionCallbackProxy::UFindFriendSessionCallbackProxy(const FObjectInitializer& ObjectInitializer)
-	: Super(ObjectInitializer)
-	, OnFindFriendSessionCompleteDelegate(FOnFindFriendSessionCompleteDelegate::CreateUObject(this, &ThisClass::OnFindFriendSessionCompleted))
-{
-}
-
-UFindFriendSessionCallbackProxy* UFindFriendSessionCallbackProxy::FindFriendSession(UObject* WorldContextObject, APlayerController *PlayerController, const FBPUniqueNetId &FriendUniqueNetId)
-{
-	UFindFriendSessionCallbackProxy* Proxy = NewObject<UFindFriendSessionCallbackProxy>();
-	Proxy->PlayerControllerWeakPtr = PlayerController;
-	Proxy->cUniqueNetId = FriendUniqueNetId;
-	Proxy->WorldContextObject = WorldContextObject;
-	return Proxy;
-}
-
-void UFindFriendSessionCallbackProxy::Activate()
-{
-	if (!cUniqueNetId.IsValid())
-	{
-		// Fail immediately
-		UE_LOG(AdvancedFindFriendSessionLog, Warning, TEXT("FindFriendSession Failed received a bad UniqueNetId!"));
-		TArray<FBlueprintSessionResult> EmptyResult;
-		OnFailure.Broadcast(EmptyResult);
-		return;
-	}
-
-	if (!PlayerControllerWeakPtr.IsValid())
-	{
-		// Fail immediately
-		UE_LOG(AdvancedFindFriendSessionLog, Warning, TEXT("FindFriendSession Failed received a bad playercontroller!"));
-		TArray<FBlueprintSessionResult> EmptyResult;
-		OnFailure.Broadcast(EmptyResult);
-		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();
-
-	if (Sessions.IsValid())
-	{	
-		ULocalPlayer* Player = Cast<ULocalPlayer>(PlayerControllerWeakPtr->Player);
-		
-		if (!Player)
-		{
-			// Fail immediately
-			UE_LOG(AdvancedFindFriendSessionLog, Warning, TEXT("FindFriendSession Failed couldn't cast to ULocalPlayer!"));
-			TArray<FBlueprintSessionResult> EmptyResult;
-			OnFailure.Broadcast(EmptyResult);
-			return;
-		}
-
-		FindFriendSessionCompleteDelegateHandle = Sessions->AddOnFindFriendSessionCompleteDelegate_Handle(Player->GetControllerId(), OnFindFriendSessionCompleteDelegate);
-
-		Sessions->FindFriendSession(Player->GetControllerId(), *cUniqueNetId.GetUniqueNetId());
-
-		return;
-	}
-
-	// Fail immediately
-	TArray<FBlueprintSessionResult> EmptyResult;
-	OnFailure.Broadcast(EmptyResult);
-}
-
-
-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());
-
-	if (Helper.IsValid())
-	{
-		IOnlineSessionPtr Sessions = Helper.OnlineSub->GetSessionInterface();
-
-		if (Sessions.IsValid())
-			Sessions->ClearOnFindFriendSessionCompleteDelegate_Handle(LocalPlayer, FindFriendSessionCompleteDelegateHandle);
-
-		if (bWasSuccessful)
-		{
-			TArray<FBlueprintSessionResult> Result;
-
-			for (auto& Sesh : SessionInfo)
-			{
-				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);
-			}
-		}
-		else
-		{
-			UE_LOG(AdvancedFindFriendSessionLog, Warning, TEXT("FindFriendSession Failed"));
-			TArray<FBlueprintSessionResult> EmptyResult;
-			OnFailure.Broadcast(EmptyResult);
-		}
-	}
-	else
-	{
-		UE_LOG(AdvancedFindFriendSessionLog, Warning, TEXT("FindFriendSession Failed"));
-		TArray<FBlueprintSessionResult> EmptyResult;
-		OnFailure.Broadcast(EmptyResult);
-	}
-}

Plugins/AdvancedSessions/Source/AdvancedSessions/Private/FindSessionsCallbackProxyAdvanced.cpp

@@ -1,444 +0,0 @@
-// Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
-#include "FindSessionsCallbackProxyAdvanced.h"
-
-#include "Online/OnlineSessionNames.h"
-
-//////////////////////////////////////////////////////////////////////////
-// UFindSessionsCallbackProxyAdvanced
-
-
-UFindSessionsCallbackProxyAdvanced::UFindSessionsCallbackProxyAdvanced(const FObjectInitializer& ObjectInitializer)
-	: Super(ObjectInitializer)
-	, Delegate(FOnFindSessionsCompleteDelegate::CreateUObject(this, &ThisClass::OnCompleted))
-	, bUseLAN(false)
-{
-	bRunSecondSearch = false;
-	bIsOnSecondSearch = false;
-}
-
-UFindSessionsCallbackProxyAdvanced* UFindSessionsCallbackProxyAdvanced::FindSessionsAdvanced(UObject* WorldContextObject, class APlayerController* PlayerController, int MaxResults, bool bUseLAN, EBPServerPresenceSearchType ServerTypeToSearch, const TArray<FSessionsSearchSetting> &Filters, bool bEmptyServersOnly, bool bNonEmptyServersOnly, bool bSecureServersOnly, bool bSearchLobbies, int MinSlotsAvailable)
-{
-	UFindSessionsCallbackProxyAdvanced* Proxy = NewObject<UFindSessionsCallbackProxyAdvanced>();	
-	Proxy->PlayerControllerWeakPtr = PlayerController;
-	Proxy->bUseLAN = bUseLAN;
-	Proxy->MaxResults = MaxResults;
-	Proxy->WorldContextObject = WorldContextObject;
-	Proxy->SearchSettings = Filters;
-	Proxy->ServerSearchType = ServerTypeToSearch;
-	Proxy->bEmptyServersOnly = bEmptyServersOnly,
-	Proxy->bNonEmptyServersOnly = bNonEmptyServersOnly;
-	Proxy->bSecureServersOnly = bSecureServersOnly;
-	Proxy->bSearchLobbies = bSearchLobbies;
-	Proxy->MinSlotsAvailable = MinSlotsAvailable;
-	return Proxy;
-}
-
-void UFindSessionsCallbackProxyAdvanced::Activate()
-{
-	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("FindSessions"), GEngine->GetWorldFromContextObject(WorldContextObject.Get(), EGetWorldErrorMode::LogAndReturnNull));
-	Helper.QueryIDFromPlayerController(PlayerControllerWeakPtr.Get());
-
-	if (Helper.IsValid())
-	{
-		auto Sessions = Helper.OnlineSub->GetSessionInterface();
-		if (Sessions.IsValid())
-		{
-			// Re-initialize here, otherwise I think there might be issues with people re-calling search for some reason before it is destroyed
-			bRunSecondSearch = false;
-			bIsOnSecondSearch = false;
-
-			DelegateHandle = Sessions->AddOnFindSessionsCompleteDelegate_Handle(Delegate);
-
-			SearchObject = MakeShareable(new FOnlineSessionSearch);
-			SearchObject->MaxSearchResults = MaxResults;
-			SearchObject->bIsLanQuery = bUseLAN;
-			//SearchObject->QuerySettings.Set(SEARCH_PRESENCE, true, EOnlineComparisonOp::Equals);
-
-			// Create temp filter variable, because I had to re-define a blueprint version of this, it is required.
-			FOnlineSearchSettingsEx tem;
-
-			/*		// Search only for dedicated servers (value is true/false)
-			#define SEARCH_DEDICATED_ONLY FName(TEXT("DEDICATEDONLY"))
-			// Search for empty servers only (value is true/false)
-			#define SEARCH_EMPTY_SERVERS_ONLY FName(TEXT("EMPTYONLY"))
-			// Search for non empty servers only (value is true/false)
-			#define SEARCH_NONEMPTY_SERVERS_ONLY FName(TEXT("NONEMPTYONLY"))
-			// Search for secure servers only (value is true/false)
-			#define SEARCH_SECURE_SERVERS_ONLY FName(TEXT("SECUREONLY"))
-			// Search for presence sessions only (value is true/false)
-			#define SEARCH_PRESENCE FName(TEXT("PRESENCESEARCH"))
-			// Search for a match with min player availability (value is int)
-			#define SEARCH_MINSLOTSAVAILABLE FName(TEXT("MINSLOTSAVAILABLE"))
-			// Exclude all matches where any unique ids in a given array are present (value is string of the form "uniqueid1;uniqueid2;uniqueid3")
-			#define SEARCH_EXCLUDE_UNIQUEIDS FName(TEXT("EXCLUDEUNIQUEIDS"))
-			// User ID to search for session of
-			#define SEARCH_USER FName(TEXT("SEARCHUSER"))
-			// Keywords to match in session search
-			#define SEARCH_KEYWORDS FName(TEXT("SEARCHKEYWORDS"))*/
-			/** Keywords to match in session search */
-			/** The matchmaking queue name to matchmake in, e.g. "TeamDeathmatch" (value is string) */
-			/** #define SEARCH_MATCHMAKING_QUEUE FName(TEXT("MATCHMAKINGQUEUE"))*/
-			/** If set, use the named Xbox Live hopper to find a session via matchmaking (value is a string) */
-			/** #define SEARCH_XBOX_LIVE_HOPPER_NAME FName(TEXT("LIVEHOPPERNAME"))*/
-			/** Which session template from the service configuration to use */
-			/** #define SEARCH_XBOX_LIVE_SESSION_TEMPLATE_NAME FName(TEXT("LIVESESSIONTEMPLATE"))*/
-			/** Selection method used to determine which match to join when multiple are returned (valid only on Switch) */
-			/** #define SEARCH_SWITCH_SELECTION_METHOD FName(TEXT("SWITCHSELECTIONMETHOD"))*/
-			/** Whether to use lobbies vs sessions */
-			/** #define SEARCH_LOBBIES FName(TEXT("LOBBYSEARCH"))*/
-
-			if (bEmptyServersOnly)
-				tem.Set(SEARCH_EMPTY_SERVERS_ONLY, true, EOnlineComparisonOp::Equals);
-
-			if (bNonEmptyServersOnly)
-				tem.Set(SEARCH_NONEMPTY_SERVERS_ONLY, true, EOnlineComparisonOp::Equals);
-
-			if (bSecureServersOnly)
-				tem.Set(SEARCH_SECURE_SERVERS_ONLY, true, EOnlineComparisonOp::Equals);
-
-			if (MinSlotsAvailable != 0)
-				tem.Set(SEARCH_MINSLOTSAVAILABLE, MinSlotsAvailable, EOnlineComparisonOp::GreaterThanEquals);
-
-			// Filter results
-			if (SearchSettings.Num() > 0)
-			{
-				for (int i = 0; i < SearchSettings.Num(); i++)
-				{
-					// Function that was added to make directly adding a FVariant possible
-					tem.HardSet(SearchSettings[i].PropertyKeyPair.Key, SearchSettings[i].PropertyKeyPair.Data, SearchSettings[i].ComparisonOp);
-				}
-			}
-
-			switch (ServerSearchType)
-			{
-
-			case EBPServerPresenceSearchType::ClientServersOnly:
-			{
-				tem.Set(SEARCH_PRESENCE, true, EOnlineComparisonOp::Equals);
-				
-				if (bSearchLobbies && !IOnlineSubsystem::DoesInstanceExist("STEAM"))
-					tem.Set(SEARCH_LOBBIES, true, EOnlineComparisonOp::Equals);
-			}
-			break;
-
-			case EBPServerPresenceSearchType::DedicatedServersOnly:
-			{
-				//tem.Set(SEARCH_DEDICATED_ONLY, true, EOnlineComparisonOp::Equals);
-			}
-			break;
-
-			case EBPServerPresenceSearchType::AllServers:
-			default:
-			{
-				//if (IOnlineSubsystem::DoesInstanceExist("STEAM"))
-				//{
-				bRunSecondSearch = true;
-
-				SearchObjectDedicated = MakeShareable(new FOnlineSessionSearch);
-				SearchObjectDedicated->MaxSearchResults = MaxResults;
-				SearchObjectDedicated->bIsLanQuery = bUseLAN;
-
-				FOnlineSearchSettingsEx DedicatedOnly = tem;
-
-				tem.Set(SEARCH_PRESENCE, true, EOnlineComparisonOp::Equals);
-
-				if (bSearchLobbies && !IOnlineSubsystem::DoesInstanceExist("STEAM"))
-					tem.Set(SEARCH_LOBBIES, true, EOnlineComparisonOp::Equals);
-
-				//DedicatedOnly.Set(SEARCH_DEDICATED_ONLY, true, EOnlineComparisonOp::Equals);
-				SearchObjectDedicated->QuerySettings = DedicatedOnly;
-				//}
-			}
-			break;
-			}
-
-			// Copy the derived temp variable over to it's base class
-			SearchObject->QuerySettings = tem;
-
-			Sessions->FindSessions(*Helper.UserID, SearchObject.ToSharedRef());
-
-			// OnQueryCompleted will get called, nothing more to do now
-			return;
-		}
-		else
-		{
-			FFrame::KismetExecutionMessage(TEXT("Sessions not supported by Online Subsystem"), ELogVerbosity::Warning);
-		}
-	}
-
-	// Fail immediately
-	OnFailure.Broadcast(SessionSearchResults);
-}
-
-void UFindSessionsCallbackProxyAdvanced::OnCompleted(bool bSuccess)
-{
-	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("FindSessionsCallback"), GEngine->GetWorldFromContextObject(WorldContextObject.Get(), EGetWorldErrorMode::LogAndReturnNull));
-	Helper.QueryIDFromPlayerController(PlayerControllerWeakPtr.Get());
-
-	if (!Helper.IsValid())
-	{
-		// Fail immediately
-		OnFailure.Broadcast(SessionSearchResults);
-		return;
-	}
-
-	if (!bRunSecondSearch && Helper.IsValid())
-	{
-		auto Sessions = Helper.OnlineSub->GetSessionInterface();
-		if (Sessions.IsValid())
-		{
-			Sessions->ClearOnFindSessionsCompleteDelegate_Handle(DelegateHandle);
-		}
-	}
-
-	if (bSuccess)
-	{
-		if (bIsOnSecondSearch)
-		{
-			if (SearchObjectDedicated.IsValid())
-			{
-				// Just log the results for now, will need to add a blueprint-compatible search result struct
-				for (auto& Result : SearchObjectDedicated->SearchResults)
-				{
-					FString ResultText = FString::Printf(TEXT("Found a session. Ping is %d"), Result.PingInMs);
-
-					FFrame::KismetExecutionMessage(*ResultText, ELogVerbosity::Log);
-
-					FBlueprintSessionResult BPResult;
-					BPResult.OnlineResult = Result;
-					SessionSearchResults.AddUnique(BPResult);
-				}
-				OnSuccess.Broadcast(SessionSearchResults);
-				return;
-			}
-		}
-		else
-		{
-			if (SearchObject.IsValid())
-			{
-				// Just log the results for now, will need to add a blueprint-compatible search result struct
-				for (auto& Result : SearchObject->SearchResults)
-				{
-					FString ResultText = FString::Printf(TEXT("Found a session. Ping is %d"), Result.PingInMs);
-
-					FFrame::KismetExecutionMessage(*ResultText, ELogVerbosity::Log);
-
-					FBlueprintSessionResult BPResult;
-					BPResult.OnlineResult = Result;
-					SessionSearchResults.AddUnique(BPResult);
-				}
-				if (!bRunSecondSearch)
-				{
-					OnSuccess.Broadcast(SessionSearchResults);
-					return;
-				}
-			}
-		}
-	}
-	else
-	{
-		if (!bRunSecondSearch)
-		{
-			// Need to account for only one of the searches failing
-			if (SessionSearchResults.Num() > 0)
-				OnSuccess.Broadcast(SessionSearchResults);
-			else
-				OnFailure.Broadcast(SessionSearchResults);
-			return;
-		}
-	}
-
-	if (Helper.IsValid() && bRunSecondSearch && ServerSearchType == EBPServerPresenceSearchType::AllServers)
-	{
-		bRunSecondSearch = false;
-		bIsOnSecondSearch = true;
-		auto Sessions = Helper.OnlineSub->GetSessionInterface();
-		Sessions->FindSessions(*Helper.UserID, SearchObjectDedicated.ToSharedRef());
-	}
-	else // We lost our player controller
-	{
-		if (bSuccess && SessionSearchResults.Num() > 0)
-			OnSuccess.Broadcast(SessionSearchResults);
-		else
-			OnFailure.Broadcast(SessionSearchResults);
-	}
-}
-
-
-void UFindSessionsCallbackProxyAdvanced::FilterSessionResults(const TArray<FBlueprintSessionResult> &SessionResults, const TArray<FSessionsSearchSetting> &Filters, TArray<FBlueprintSessionResult> &FilteredResults)
-{
-	for (int j = 0; j < SessionResults.Num(); j++)
-	{
-		bool bAddResult = true;
-
-		// Filter results
-		if (Filters.Num() > 0)
-		{
-			const FOnlineSessionSetting * setting;
-			for (int i = 0; i < Filters.Num(); i++)
-			{
-				setting = SessionResults[j].OnlineResult.Session.SessionSettings.Settings.Find(Filters[i].PropertyKeyPair.Key);
-
-				// Couldn't find this key
-				if (!setting)
-					continue;
-
-				if (!CompareVariants(setting->Data, Filters[i].PropertyKeyPair.Data, Filters[i].ComparisonOp))
-				{
-					bAddResult = false;
-					break;
-				}
-			}
-		}
-
-		if (bAddResult)
-			FilteredResults.Add(SessionResults[j]);
-	}
-
-	return;
-}
-
-
-bool UFindSessionsCallbackProxyAdvanced::CompareVariants(const FVariantData &A, const FVariantData &B, EOnlineComparisonOpRedux Comparator)
-{
-	if (A.GetType() != B.GetType())
-		return false;
-
-	switch (A.GetType())
-	{
-	case EOnlineKeyValuePairDataType::Bool:
-	{
-		bool bA, bB;
-		A.GetValue(bA);
-		B.GetValue(bB);
-		switch (Comparator)
-		{
-		case EOnlineComparisonOpRedux::Equals:
-			return bA == bB; break;
-		case EOnlineComparisonOpRedux::NotEquals:
-			return bA != bB; break;
-		default:
-			return false;break;
-		}
-	}
-	case EOnlineKeyValuePairDataType::Double:
-	{
-		double bA, bB;
-		A.GetValue(bA);
-		B.GetValue(bB);
-		switch (Comparator)
-		{
-		case EOnlineComparisonOpRedux::Equals:
-			return bA == bB; break;
-		case EOnlineComparisonOpRedux::NotEquals:
-			return bA != bB; break;
-		case EOnlineComparisonOpRedux::GreaterThanEquals:
-			return (bA == bB || bA > bB); break;
-		case EOnlineComparisonOpRedux::LessThanEquals:
-			return (bA == bB || bA < bB); break;
-		case EOnlineComparisonOpRedux::GreaterThan:
-			return bA > bB; break;
-		case EOnlineComparisonOpRedux::LessThan:
-			return bA < bB; break;
-		default:
-			return false; break;
-		}
-	}
-	case EOnlineKeyValuePairDataType::Float:
-	{
-		float tbA, tbB;
-		double bA, bB;
-		A.GetValue(tbA);
-		B.GetValue(tbB);
-		bA = (double)tbA;
-		bB = (double)tbB;
-		switch (Comparator)
-		{
-		case EOnlineComparisonOpRedux::Equals:
-			return bA == bB; break;
-		case EOnlineComparisonOpRedux::NotEquals:
-			return bA != bB; break;
-		case EOnlineComparisonOpRedux::GreaterThanEquals:
-			return (bA == bB || bA > bB); break;
-		case EOnlineComparisonOpRedux::LessThanEquals:
-			return (bA == bB || bA < bB); break;
-		case EOnlineComparisonOpRedux::GreaterThan:
-			return bA > bB; break;
-		case EOnlineComparisonOpRedux::LessThan:
-			return bA < bB; break;
-		default:
-			return false; break;
-		}
-	}
-	case EOnlineKeyValuePairDataType::Int32:
-	{
-		int32 bA, bB;
-		A.GetValue(bA);
-		B.GetValue(bB);
-		switch (Comparator)
-		{
-		case EOnlineComparisonOpRedux::Equals:
-			return bA == bB; break;
-		case EOnlineComparisonOpRedux::NotEquals:
-			return bA != bB; break;
-		case EOnlineComparisonOpRedux::GreaterThanEquals:
-			return (bA == bB || bA > bB); break;
-		case EOnlineComparisonOpRedux::LessThanEquals:
-			return (bA == bB || bA < bB); break;
-		case EOnlineComparisonOpRedux::GreaterThan:
-			return bA > bB; break;
-		case EOnlineComparisonOpRedux::LessThan:
-			return bA < bB; break;
-		default:
-			return false; break;
-		}
-	}
-	case EOnlineKeyValuePairDataType::Int64:
-	{
-		uint64 bA, bB;
-		A.GetValue(bA);
-		B.GetValue(bB);
-		switch (Comparator)
-		{
-		case EOnlineComparisonOpRedux::Equals:
-			return bA == bB; break;
-		case EOnlineComparisonOpRedux::NotEquals:
-			return bA != bB; break;
-		case EOnlineComparisonOpRedux::GreaterThanEquals:
-			return (bA == bB || bA > bB); break;
-		case EOnlineComparisonOpRedux::LessThanEquals:
-			return (bA == bB || bA < bB); break;
-		case EOnlineComparisonOpRedux::GreaterThan:
-			return bA > bB; break;
-		case EOnlineComparisonOpRedux::LessThan:
-			return bA < bB; break;
-		default:
-			return false; break;
-		}
-	}
-
-	case EOnlineKeyValuePairDataType::String:
-	{
-		FString bA, bB;
-		A.GetValue(bA);
-		B.GetValue(bB);
-		switch (Comparator)
-		{
-		case EOnlineComparisonOpRedux::Equals:
-			return bA == bB; break;
-		case EOnlineComparisonOpRedux::NotEquals:
-			return bA != bB; break;
-		default:
-			return false; break;
-		}
-	}
-
-	case EOnlineKeyValuePairDataType::Empty:
-	case EOnlineKeyValuePairDataType::Blob:
-	default:
-		return false; break;
-	}
-
-
-
-}

Plugins/AdvancedSessions/Source/AdvancedSessions/Private/GetFriendsCallbackProxy.cpp

@@ -1,114 +0,0 @@
-// Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
-#include "GetFriendsCallbackProxy.h"
-
-#include "Online.h"
-#include "Interfaces/OnlineFriendsInterface.h"
-#include "Interfaces/OnlinePresenceInterface.h"
-
-//////////////////////////////////////////////////////////////////////////
-// UGetFriendsCallbackProxy
-DEFINE_LOG_CATEGORY(AdvancedGetFriendsLog);
-
-UGetFriendsCallbackProxy::UGetFriendsCallbackProxy(const FObjectInitializer& ObjectInitializer)
-	: Super(ObjectInitializer)
-	, FriendListReadCompleteDelegate(FOnReadFriendsListComplete::CreateUObject(this, &ThisClass::OnReadFriendsListCompleted))
-{
-}
-
-UGetFriendsCallbackProxy* UGetFriendsCallbackProxy::GetAndStoreFriendsList(UObject* WorldContextObject, class APlayerController* PlayerController)
-{
-	UGetFriendsCallbackProxy* Proxy = NewObject<UGetFriendsCallbackProxy>();
-	Proxy->PlayerControllerWeakPtr = PlayerController;
-	Proxy->WorldContextObject = WorldContextObject;
-	return Proxy;
-}
-
-void UGetFriendsCallbackProxy::Activate()
-{
-	if (!PlayerControllerWeakPtr.IsValid())
-	{
-		// Fail immediately
-		UE_LOG(AdvancedGetFriendsLog, Warning, TEXT("GetFriends Failed received a bad player controller!"));
-		TArray<FBPFriendInfo> EmptyArray;
-		OnFailure.Broadcast(EmptyArray);
-		return;
-	}
-
-	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("GetFriends"), GEngine->GetWorldFromContextObject(WorldContextObject.Get(), EGetWorldErrorMode::LogAndReturnNull));
-	Helper.QueryIDFromPlayerController(PlayerControllerWeakPtr.Get());
-
-	if (Helper.IsValid())
-	{
-		IOnlineFriendsPtr Friends = Helper.OnlineSub->GetFriendsInterface();
-		if (Friends.IsValid())
-		{
-			ULocalPlayer* Player = Cast<ULocalPlayer>(PlayerControllerWeakPtr->Player);
-
-			Friends->ReadFriendsList(Player->GetControllerId(), EFriendsLists::ToString((EFriendsLists::Default)), FriendListReadCompleteDelegate);
-			return;
-		}
-	}
-
-	// Fail immediately
-	TArray<FBPFriendInfo> EmptyArray;
-	OnFailure.Broadcast(EmptyArray);
-}
-
-void UGetFriendsCallbackProxy::OnReadFriendsListCompleted(int32 LocalUserNum, bool bWasSuccessful, const FString& ListName, const FString& ErrorString)
-{
-	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();
-		if (Friends.IsValid())
-		{
-			// Not actually needed anymore, plus was not being validated and causing a crash
-			//ULocalPlayer* Player = Cast<ULocalPlayer>(PlayerControllerWeakPtr->Player);
-
-			TArray<FBPFriendInfo> FriendsListOut;
-			TArray< TSharedRef<FOnlineFriend> > FriendList;
-			if (Friends->GetFriendsList(LocalUserNum, ListName, FriendList))
-			{
-				for (int32 i = 0; i < FriendList.Num(); i++)
-				{
-					FBPFriendInfo BPF;
-					const FOnlineUserPresence& pres = FriendList[i]->GetPresence();
-					BPF.OnlineState = ((EBPOnlinePresenceState)((int32)pres.Status.State));
-					BPF.DisplayName = FriendList[i]->GetDisplayName();
-					BPF.RealName = FriendList[i]->GetRealName();
-					BPF.UniqueNetId.SetUniqueNetId(FriendList[i]->GetUserId());
-					BPF.bIsPlayingSameGame = pres.bIsPlayingThisGame;
-
-					BPF.PresenceInfo.bIsOnline = pres.bIsOnline;
-					BPF.PresenceInfo.bHasVoiceSupport = pres.bHasVoiceSupport;
-					BPF.PresenceInfo.bIsPlaying = pres.bIsPlaying;
-					BPF.PresenceInfo.PresenceState = ((EBPOnlinePresenceState)((int32)pres.Status.State));
-					
-					// #TODO: Check back in on this in shipping, epic is missing the UTF8_TO_TCHAR call on converting this and its making an invalid string
-					//BPF.PresenceInfo.StatusString = pres.Status.StatusStr;
-					BPF.PresenceInfo.bIsJoinable = pres.bIsJoinable;
-					BPF.PresenceInfo.bIsPlayingThisGame = pres.bIsPlayingThisGame;
-
-
-					FriendsListOut.Add(BPF);
-				}
-			}
-
-			OnSuccess.Broadcast(FriendsListOut);
-		}
-	}
-	else
-	{
-		TArray<FBPFriendInfo> EmptyArray;
-		OnFailure.Broadcast(EmptyArray);
-	}
-}

Plugins/AdvancedSessions/Source/AdvancedSessions/Private/GetRecentPlayersCallbackProxy.cpp

@@ -1,104 +0,0 @@
-// Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
-#include "GetRecentPlayersCallbackProxy.h"
-
-#include "Online.h"
-
-//////////////////////////////////////////////////////////////////////////
-// UGetRecentPlayersCallbackProxy
-DEFINE_LOG_CATEGORY(AdvancedGetRecentPlayersLog);
-
-UGetRecentPlayersCallbackProxy::UGetRecentPlayersCallbackProxy(const FObjectInitializer& ObjectInitializer)
-	: Super(ObjectInitializer)
-	, QueryRecentPlayersCompleteDelegate(FOnQueryRecentPlayersCompleteDelegate::CreateUObject(this, &ThisClass::OnQueryRecentPlayersCompleted))
-{
-}
-
-UGetRecentPlayersCallbackProxy* UGetRecentPlayersCallbackProxy::GetAndStoreRecentPlayersList(UObject* WorldContextObject, const FBPUniqueNetId& UniqueNetId)
-{
-	UGetRecentPlayersCallbackProxy* Proxy = NewObject<UGetRecentPlayersCallbackProxy>();
-	Proxy->cUniqueNetId = UniqueNetId;
-	Proxy->WorldContextObject = WorldContextObject;
-	return Proxy;
-}
-
-void UGetRecentPlayersCallbackProxy::Activate()
-{
-	if (!cUniqueNetId.IsValid())
-	{
-		// Fail immediately
-		UE_LOG(AdvancedGetRecentPlayersLog, Warning, TEXT("GetRecentPlayers Failed received a bad UniqueNetId!"));
-		TArray<FBPOnlineRecentPlayer> EmptyArray;
-		OnFailure.Broadcast(EmptyArray);
-		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();
-	if (Friends.IsValid())
-	{	
-		DelegateHandle = Friends->AddOnQueryRecentPlayersCompleteDelegate_Handle(QueryRecentPlayersCompleteDelegate);
-
-		// Testing with null namespace
-		Friends->QueryRecentPlayers(*(cUniqueNetId.GetUniqueNetId()), "");
-		return;
-	}
-	// Fail immediately
-	TArray<FBPOnlineRecentPlayer> EmptyArray;
-	OnFailure.Broadcast(EmptyArray);
-}
-
-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();
-	if (Friends.IsValid())
-		Friends->ClearOnQueryRecentPlayersCompleteDelegate_Handle(DelegateHandle);
-
-
-	if (bWasSuccessful)
-	{
-		// WHOOPS
-		//IOnlineFriendsPtr Friends = Online::GetFriendsInterface();
-		if (Friends.IsValid())
-		{
-			TArray<FBPOnlineRecentPlayer> PlayersListOut;
-			TArray< TSharedRef<FOnlineRecentPlayer> > PlayerList;
-
-			Friends->GetRecentPlayers(*(cUniqueNetId.GetUniqueNetId()), "", PlayerList);
-				
-			for (int32 i = 0; i < PlayerList.Num(); i++)
-			{
-				TSharedRef<FOnlineRecentPlayer> Player = PlayerList[i];
-				FBPOnlineRecentPlayer BPF;
-				BPF.DisplayName = Player->GetDisplayName();
-				BPF.RealName = Player->GetRealName();
-				BPF.UniqueNetId.SetUniqueNetId(Player->GetUserId());
-				PlayersListOut.Add(BPF);
-			}
-
-			OnSuccess.Broadcast(PlayersListOut);
-		}
-	}
-	else
-	{
-		TArray<FBPOnlineRecentPlayer> EmptyArray;
-		OnFailure.Broadcast(EmptyArray);
-	}
-}

Plugins/AdvancedSessions/Source/AdvancedSessions/Private/GetUserPrivilegeCallbackProxy.cpp

@@ -1,48 +0,0 @@
-// Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
-
-#include "GetUserPrivilegeCallbackProxy.h"
-
-#include "Online.h"
-
-//////////////////////////////////////////////////////////////////////////
-// UGetUserPrivilegeCallbackProxy
-
-UGetUserPrivilegeCallbackProxy::UGetUserPrivilegeCallbackProxy(const FObjectInitializer& ObjectInitializer)
-	: Super(ObjectInitializer)
-{
-}
-
-UGetUserPrivilegeCallbackProxy* UGetUserPrivilegeCallbackProxy::GetUserPrivilege(UObject* WorldContextObject, const EBPUserPrivileges & PrivilegeToCheck, const FBPUniqueNetId & PlayerUniqueNetID)
-{
-	UGetUserPrivilegeCallbackProxy* Proxy = NewObject<UGetUserPrivilegeCallbackProxy>();
-	Proxy->PlayerUniqueNetID.SetUniqueNetId(PlayerUniqueNetID.GetUniqueNetId());
-	Proxy->UserPrivilege = PrivilegeToCheck;
-	Proxy->WorldContextObject = WorldContextObject;
-	return Proxy;
-}
-
-void UGetUserPrivilegeCallbackProxy::Activate()
-{
-	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("GetUserPrivilege"), GEngine->GetWorldFromContextObject(WorldContextObject.Get(), EGetWorldErrorMode::LogAndReturnNull));
-
-	if (!Helper.OnlineSub)
-	{
-		OnFailure.Broadcast();
-		return;
-	}
-	auto Identity = Helper.OnlineSub->GetIdentityInterface();
-
-	if (Identity.IsValid())
-	{
-		Identity->GetUserPrivilege(*PlayerUniqueNetID.GetUniqueNetId(), (EUserPrivileges::Type)UserPrivilege, IOnlineIdentity::FOnGetUserPrivilegeCompleteDelegate::CreateUObject(this, &ThisClass::OnCompleted));
-		return;
-	}
-
-	// Fail immediately
-	OnFailure.Broadcast();
-}
-
-void UGetUserPrivilegeCallbackProxy::OnCompleted(const FUniqueNetId& PlayerID, EUserPrivileges::Type Privilege, uint32 PrivilegeResult)
-{
-	OnSuccess.Broadcast(/*PlayerID,*/ (EBPUserPrivileges)Privilege, PrivilegeResult == 0);
-}