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

start add of join button (still need to grab the external IP address)

Browse Source 
finish up fixes for alias stuff
This commit is contained in:
RaidMax
2019-04-07 20:14:59 -05:00
parent 8667532d24
commit dd82a5e3fa
10 changed files with 55 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
SharedLibraryCore/Dtos/ServerInfo.cs
View File

@ -19,5 +19,6 @@ namespace SharedLibraryCore.Dtos
public Helpers.PlayerHistory[] PlayerHistory { get; set; }
public long ID { get; set; }
public bool Online { get; set; }
public string ConnectProtocolUrl { get; set; }
}
}

9
SharedLibraryCore/Services/ClientService.cs
View File

@ -135,7 +135,7 @@ namespace SharedLibraryCore.Services
// this happens when the link we found is different than the one we create before adding an IP
if (isAliasLinkUpdated)
{
entity.CurrentServer.Logger.WriteDebug($"found a link for {entity} so we are updating link from {entity.AliasLink.AliasLinkId} to {newAliasLink.AliasLinkId}");
entity.CurrentServer.Logger.WriteDebug($"[updatealias] found a link for {entity} so we are updating link from {entity.AliasLink.AliasLinkId} to {newAliasLink.AliasLinkId}");
var oldAliasLink = entity.AliasLink;
@ -161,7 +161,7 @@ namespace SharedLibraryCore.Services
// the existing alias matches ip and name, so we can just ignore the temporary one
if (hasExactAliasMatch)
{
entity.CurrentServer.Logger.WriteDebug($"{entity} has exact alias match");
entity.CurrentServer.Logger.WriteDebug($"[updatealias] {entity} has exact alias match");
var oldAlias = entity.CurrentAlias;
entity.CurrentAliasId = existingExactAlias.AliasId;
@ -169,8 +169,9 @@ namespace SharedLibraryCore.Services
await context.SaveChangesAsync();
// the alias is the same so we can just remove it
if (oldAlias.AliasId != existingExactAlias.AliasId)
if (oldAlias.AliasId != existingExactAlias.AliasId && oldAlias.AliasId > 0)
{
entity.CurrentServer.Logger.WriteDebug($"[updatealias] {entity} has exact alias match, so we're going to try to remove aliasId {oldAlias.AliasId} with linkId {oldAlias.AliasId}");
context.Aliases.Remove(oldAlias);
await context.SaveChangesAsync();
}
@ -179,7 +180,7 @@ namespace SharedLibraryCore.Services
// theres no exact match, but they've played before with the GUID or IP
else
{
entity.CurrentServer.Logger.WriteDebug($"Connecting player is using a new alias {entity}");
entity.CurrentServer.Logger.WriteDebug($"[updatealias] {entity} is using a new alias");
var newAlias = new EFAlias()
{

1
SharedLibraryCore/Utilities.cs
View File

@ -8,6 +8,7 @@ using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Text;