PvE/Torch
3
0
Fork 0
Code Issues 1 Pull Requests Actions Releases 21 Wiki Activity

Merge branch 'master' of https://github.com/TorchAPI/Torch into Patron

Browse Source
This commit is contained in:
Brant Martin
2019-03-02 11:42:24 -05:00
parent 651865f28a 27493d3b23
commit dc7a27a5e3
4 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Torch/Extensions/MyPlayerCollectionExtensions.cs
View File

@@ -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)}";
}
}
}

2
Torch/Managers/ChatManager/ChatManagerServer.cs
View File

@@ -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}";
}
}
}

2
Torch/Managers/MultiplayerManagerBase.cs
View File

@@ -100,7 +100,7 @@ namespace Torch.Managers
/// <inheritdoc />
public string GetSteamUsername(ulong steamId)
{
return MySession.Static.Players.TryGetPlayerName(steamId);
return MyMultiplayer.Static.GetMemberName(steamId);
}
private void OnClientLeft(ulong steamId, MyChatMemberStateChangeEnum stateChange)

2
Torch/ViewModels/PlayerViewModel.cs
View File

@@ -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);
}
}
}