Rim/IW4M-Admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 30 Wiki Activity

[tweaks and fixes]

Browse Source 
reenable tekno support
address vagrant thread issue
refactor game log reader creation to follow better practices
fix bot issues/address how guids are generated for bots/none provided
This commit is contained in:
RaidMax
2020-05-04 16:50:02 -05:00
parent b49592d666
commit 267e0b8cbe
50 changed files with 775 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
SharedLibraryCore/PartialEntities/EFClient.cs
View File

@ -142,7 +142,7 @@ namespace SharedLibraryCore.Database.Models
Data = message
};
CurrentServer?.Manager.GetEventHandler().AddEvent(e);
CurrentServer?.Manager.AddEvent(e);
return e;
}
@ -174,7 +174,7 @@ namespace SharedLibraryCore.Database.Models
Warnings++;
}
sender.CurrentServer.Manager.GetEventHandler().AddEvent(e);
sender.CurrentServer.Manager.AddEvent(e);
return e;
}
@ -202,7 +202,7 @@ namespace SharedLibraryCore.Database.Models
Warnings = 0;
sender.CurrentServer.Manager.GetEventHandler().AddEvent(e);
sender.CurrentServer.Manager.AddEvent(e);
return e;
}
@ -243,7 +243,7 @@ namespace SharedLibraryCore.Database.Models
}
sender.SetAdditionalProperty("_reportCount", reportCount + 1);
sender.CurrentServer.Manager.GetEventHandler().AddEvent(e);
sender.CurrentServer.Manager.AddEvent(e);
return e;
}
@ -276,7 +276,7 @@ namespace SharedLibraryCore.Database.Models
e.FailReason = GameEvent.EventFailReason.Invalid;
}
sender.CurrentServer.Manager.GetEventHandler().AddEvent(e);
sender.CurrentServer.Manager.AddEvent(e);
return e;
}
@ -308,7 +308,7 @@ namespace SharedLibraryCore.Database.Models
e.FailReason = GameEvent.EventFailReason.Invalid;
}
sender.CurrentServer.Manager.GetEventHandler().AddEvent(e);
sender.CurrentServer.Manager.AddEvent(e);
return e;
}
@ -336,7 +336,7 @@ namespace SharedLibraryCore.Database.Models
}
State = ClientState.Disconnecting;
sender.CurrentServer.Manager.GetEventHandler().AddEvent(e);
sender.CurrentServer.Manager.AddEvent(e);
return e;
}
@ -366,7 +366,7 @@ namespace SharedLibraryCore.Database.Models
}
State = ClientState.Disconnecting;
sender.CurrentServer.Manager.GetEventHandler().AddEvent(e);
sender.CurrentServer.Manager.AddEvent(e);
return e;
}
@ -400,7 +400,7 @@ namespace SharedLibraryCore.Database.Models
}
State = ClientState.Disconnecting;
sender.CurrentServer.Manager.GetEventHandler().AddEvent(e);
sender.CurrentServer.Manager.AddEvent(e);
return e;
}
@ -428,7 +428,7 @@ namespace SharedLibraryCore.Database.Models
e.FailReason = GameEvent.EventFailReason.Permission;
}
sender.CurrentServer.Manager.GetEventHandler().AddEvent(e);
sender.CurrentServer.Manager.AddEvent(e);
return e;
}
@ -464,7 +464,7 @@ namespace SharedLibraryCore.Database.Models
Level = newPermission;
}
sender.CurrentServer.Manager.GetEventHandler().AddEvent(e);
sender.CurrentServer.Manager.AddEvent(e);
return e;
}
@ -565,7 +565,7 @@ namespace SharedLibraryCore.Database.Models
Owner = CurrentServer,
};
CurrentServer.Manager.GetEventHandler().AddEvent(e);
CurrentServer.Manager.AddEvent(e);
}
}
@ -655,7 +655,7 @@ namespace SharedLibraryCore.Database.Models
[NotMapped]
public int Score { get; set; }
[NotMapped]
public bool IsBot => NetworkId == -1;
public bool IsBot => NetworkId == Name.GenerateGuidFromString();
[NotMapped]
public ClientState State { get; set; }
@ -694,7 +694,7 @@ namespace SharedLibraryCore.Database.Models
public override bool Equals(object obj)
{
return ((EFClient)obj).NetworkId == this.NetworkId;
return obj.GetType() == typeof(EFClient) && ((EFClient)obj).NetworkId == this.NetworkId;
}
public override int GetHashCode()