Merge pull request #120 from blaho/session-mgr-cmp

Exposed information about banned players

Author: Equinox-

Torch.API/Managers/IMultiplayerManagerServer.cs

@@ -20,5 +20,17 @@ public interface IMultiplayerManagerServer : IMultiplayerManagerBase
         /// Bans or unbans a player from the game.
         /// </summary>
         void BanPlayer(ulong steamId, bool banned = true);
+
+        /// <summary>
+        /// List of the banned SteamID's
+        /// </summary>        
+        IReadOnlyList<ulong> BannedPlayers { get; }
+
+        /// <summary>
+        /// Checks if the player with the given SteamID is banned.
+        /// </summary>
+        /// <param name="steamId">The SteamID of the player.</param>
+        /// <returns>True if the player is banned; otherwise false.</returns>
+        bool IsBanned(ulong steamId);
     }
 }

Torch.Client/Manager/MultiplayerManagerLobby.cs

@@ -12,6 +12,9 @@ namespace Torch.Client.Manager
 {
     public class MultiplayerManagerLobby : MultiplayerManagerBase, IMultiplayerManagerServer
     {
+        /// <inheritdoc />
+        public IReadOnlyList<ulong> BannedPlayers => new List<ulong>();
+
         /// <inheritdoc />
         public MultiplayerManagerLobby(ITorchBase torch) : base(torch) { }
 
@@ -21,6 +24,9 @@ public MultiplayerManagerLobby(ITorchBase torch) : base(torch) { }
         /// <inheritdoc />
         public void BanPlayer(ulong steamId, bool banned = true) => Torch.Invoke(() => MyMultiplayer.Static.BanClient(steamId, banned));
 
+        /// <inheritdoc />
+        public bool IsBanned(ulong steamId) => false;
+
         /// <inheritdoc/>
         public override void Attach()
         {

Torch.Server/Managers/MultiplayerManagerDedicated.cs

@@ -31,6 +31,9 @@ public class MultiplayerManagerDedicated : MultiplayerManagerBase, IMultiplayerM
         private static Func<MyDedicatedServerBase, HashSet<ulong>> _waitingForGroup;
 #pragma warning restore 649
 
+        /// <inheritdoc />
+        public IReadOnlyList<ulong> BannedPlayers => MySandboxGame.ConfigDedicated.Banned;
+
         private Dictionary<ulong, ulong> _gameOwnerIds = new Dictionary<ulong, ulong>();
 
         /// <inheritdoc />
@@ -50,6 +53,9 @@ public void BanPlayer(ulong steamId, bool banned = true)
             });
         }
 
+        /// <inheritdoc />
+        public bool IsBanned(ulong steamId) => _isClientBanned.Invoke(MyMultiplayer.Static, steamId) || MySandboxGame.ConfigDedicated.Banned.Contains(steamId);
+
         /// <inheritdoc/>
         public override void Attach()
         {
@@ -107,7 +113,7 @@ public override void Detach()
         private void ValidateAuthTicketResponse(ulong steamID, JoinResult response, ulong steamOwner)
         {
             _log.Debug($"ValidateAuthTicketResponse(user={steamID}, response={response}, owner={steamOwner}");
-            if (_isClientBanned.Invoke(MyMultiplayer.Static, steamOwner) || MySandboxGame.ConfigDedicated.Banned.Contains(steamOwner))
+            if (IsBanned(steamOwner))
             {
                 _userRejected.Invoke((MyDedicatedServerBase)MyMultiplayer.Static, steamID, JoinResult.BannedByAdmins);
                 _raiseClientKicked.Invoke((MyDedicatedServerBase)MyMultiplayer.Static, steamID);