INSANEMODE/IW4M-Admin
1
0
Fork 0
mirror of https://github.com/RaidMax/IW4M-Admin.git synced 2025-06-10 15:20:48 -05:00
Code Issues Releases Wiki Activity

started work on getting the restart functionality in the gamelogserver

Browse Source 
fix bug with unbanned players still showing as banned via lock icon
move player based stuff into client class
finally renamed Player to EFClient via partial class
don't try to run this build because it's in between stages
This commit is contained in:
RaidMax
2018-11-05 21:01:29 -06:00
parent 515443c84a
commit a320389736
65 changed files with 864 additions and 743 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
SharedLibraryCore/Events/GameEvent.cs
View File

@ -1,6 +1,7 @@
using System;
using System.Threading;
using System.Threading.Tasks;
using SharedLibraryCore.Database.Models;
using SharedLibraryCore.Objects;
namespace SharedLibraryCore
@ -50,11 +51,11 @@ namespace SharedLibraryCore
/// </summary>
Stop,
/// <summary>
/// a client was detecting as connecting via RCon
/// a client was detecting as connecting via log
/// </summary>
Connect,
/// <summary>
/// a client was detecting joining via log
/// a client was detecting joining by RCon
/// </summary>
Join,
/// <summary>
@ -170,8 +171,8 @@ namespace SharedLibraryCore
public EventType Type;
public string Data; // Data is usually the message sent by player
public string Message;
public Player Origin;
public Player Target;
public EFClient Origin;
public EFClient Target;
public Server Owner;
public Boolean Remote = false;
public object Extra { get; set; }
@ -200,7 +201,7 @@ namespace SharedLibraryCore
public static bool ShouldOriginEventBeDelayed(GameEvent queuedEvent)
{
return queuedEvent.Origin != null &&
(queuedEvent.Origin.State != Player.ClientState.Connected &&
(queuedEvent.Origin.State != EFClient.ClientState.Connected &&
// we want to allow join and quit events
queuedEvent.Type != EventType.Connect &&
queuedEvent.Type != EventType.Join &&
@ -219,7 +220,7 @@ namespace SharedLibraryCore
public static bool ShouldTargetEventBeDelayed(GameEvent queuedEvent)
{
return (queuedEvent.Target != null && queuedEvent.Target.ClientNumber != -1) &&
(queuedEvent.Target.State != Player.ClientState.Connected &&
(queuedEvent.Target.State != EFClient.ClientState.Connected &&
queuedEvent.Target.NetworkId != 0 &&
queuedEvent.Origin?.ClientId != 1);
}