From 27493d3b23d3e4e506f43a5655fe125b2d491a19 Mon Sep 17 00:00:00 2001 From: John Gross Date: Fri, 1 Mar 2019 20:28:38 -0800 Subject: [PATCH] Revert "Replace the stupid MyMultiplayer.GetMemberName with something that actually works." This reverts commit 8c59098c2809bc2a20f55c84dd43462c8820d73a. --- Torch/Extensions/MyPlayerCollectionExtensions.cs | 15 --------------- Torch/Managers/ChatManager/ChatManagerServer.cs | 2 +- Torch/Managers/MultiplayerManagerBase.cs | 2 +- Torch/ViewModels/PlayerViewModel.cs | 2 +- 4 files changed, 3 insertions(+), 18 deletions(-) diff --git a/Torch/Extensions/MyPlayerCollectionExtensions.cs b/Torch/Extensions/MyPlayerCollectionExtensions.cs index 08f0789..aa9bf39 100644 --- a/Torch/Extensions/MyPlayerCollectionExtensions.cs +++ b/Torch/Extensions/MyPlayerCollectionExtensions.cs @@ -19,20 +19,5 @@ namespace Torch return null; return collection.TryGetPlayerById(playerId, out MyPlayer player) ? player : null; } - - public static string TryGetPlayerName(this MyPlayerCollection collection, ulong steamId, int serialId = 0) - { - return collection.TryGetPlayerBySteamId(steamId, serialId)?.DisplayName ?? $"ID: {steamId}"; - } - - public static string TryGetPlayerName(this MyPlayerCollection collection, long identityId) - { - if (!collection.TryGetPlayerId(identityId, out MyPlayer.PlayerId playerId)) - return null; - - collection.TryGetPlayerById(playerId, out MyPlayer player); - - return player?.DisplayName ?? $"ID: {collection.TryGetSteamId(identityId)}"; - } } } diff --git a/Torch/Managers/ChatManager/ChatManagerServer.cs b/Torch/Managers/ChatManager/ChatManagerServer.cs index ee6270c..e58a840 100644 --- a/Torch/Managers/ChatManager/ChatManagerServer.cs +++ b/Torch/Managers/ChatManager/ChatManagerServer.cs @@ -170,7 +170,7 @@ namespace Torch.Managers.ChatManager public static string GetMemberName(ulong steamId) { - return MySession.Static.Players.TryGetPlayerName(steamId); + return MyMultiplayer.Static?.GetMemberName(steamId) ?? $"user_{steamId}"; } } } diff --git a/Torch/Managers/MultiplayerManagerBase.cs b/Torch/Managers/MultiplayerManagerBase.cs index 4a72ecc..30bf775 100644 --- a/Torch/Managers/MultiplayerManagerBase.cs +++ b/Torch/Managers/MultiplayerManagerBase.cs @@ -100,7 +100,7 @@ namespace Torch.Managers /// public string GetSteamUsername(ulong steamId) { - return MySession.Static.Players.TryGetPlayerName(steamId); + return MyMultiplayer.Static.GetMemberName(steamId); } private void OnClientLeft(ulong steamId, MyChatMemberStateChangeEnum stateChange) diff --git a/Torch/ViewModels/PlayerViewModel.cs b/Torch/ViewModels/PlayerViewModel.cs index 4876b8b..f070a3a 100644 --- a/Torch/ViewModels/PlayerViewModel.cs +++ b/Torch/ViewModels/PlayerViewModel.cs @@ -34,7 +34,7 @@ namespace Torch.ViewModels public PlayerViewModel(ulong steamId, string name = null) { SteamId = steamId; - Name = name ?? MySession.Static.Players.TryGetPlayerName(steamId); + Name = name ?? ((MyDedicatedServerBase)MyMultiplayerMinimalBase.Instance).GetMemberName(steamId); } } }