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

Merge branch 'staging' into session-mgr-cmp

Browse Source 
# Conflicts:
#	Torch.API/Managers/IMultiplayerManager.cs
#	Torch/Managers/MultiplayerManager.cs
This commit is contained in:
Tomas Blaho
2017-09-20 16:13:38 +02:00
parent 5eceb21ec7 d8e2072493
commit f1fc49d276
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Torch.API/Managers/IMultiplayerManagerServer.cs
View File

@@ -20,5 +20,17 @@ namespace Torch.API.Managers
/// Bans or unbans a player from the game. /// Bans or unbans a player from the game.
/// </summary> /// </summary>
void BanPlayer(ulong steamId, bool banned = true); void BanPlayer(ulong steamId, bool banned = true);
/// <summary>
/// List of the banned SteamID's
/// </summary>
List<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);
} }
} }

8
Torch.Server/Managers/MultiplayerManagerDedicated.cs
View File

@@ -31,6 +31,9 @@ namespace Torch.Server.Managers
private static Func<MyDedicatedServerBase, HashSet<ulong>> _waitingForGroup; private static Func<MyDedicatedServerBase, HashSet<ulong>> _waitingForGroup;
#pragma warning restore 649 #pragma warning restore 649
/// <inheritdoc />
public List<ulong> BannedPlayers => MySandboxGame.ConfigDedicated.Banned;
private Dictionary<ulong, ulong> _gameOwnerIds = new Dictionary<ulong, ulong>(); private Dictionary<ulong, ulong> _gameOwnerIds = new Dictionary<ulong, ulong>();
/// <inheritdoc /> /// <inheritdoc />
@@ -50,6 +53,9 @@ namespace Torch.Server.Managers
}); });
} }
/// <inheritdoc />
public bool IsBanned(ulong steamId) => _isClientBanned.Invoke(MyMultiplayer.Static, steamId) || MySandboxGame.ConfigDedicated.Banned.Contains(steamId);
/// <inheritdoc/> /// <inheritdoc/>
public override void Attach() public override void Attach()
{ {
@@ -107,7 +113,7 @@ namespace Torch.Server.Managers
private void ValidateAuthTicketResponse(ulong steamID, JoinResult response, ulong steamOwner) private void ValidateAuthTicketResponse(ulong steamID, JoinResult response, ulong steamOwner)
{ {
_log.Debug($"ValidateAuthTicketResponse(user={steamID}, response={response}, owner={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); _userRejected.Invoke((MyDedicatedServerBase)MyMultiplayer.Static, steamID, JoinResult.BannedByAdmins);
_raiseClientKicked.Invoke((MyDedicatedServerBase)MyMultiplayer.Static, steamID); _raiseClientKicked.Invoke((MyDedicatedServerBase)MyMultiplayer.Static, steamID);