1
0
mirror of https://github.com/RaidMax/IW4M-Admin.git synced 2025-06-10 15:20:48 -05:00

tweaks to stats and fixed the alias command, made the logger thread safe.. whoops

This commit is contained in:
RaidMax
2017-06-01 12:42:28 -05:00
parent 063449d9c4
commit 04df8d5408
12 changed files with 99 additions and 63 deletions

View File

@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Linq;
using SharedLibrary;
using SharedLibrary.Network;
using System.Threading.Tasks;
@ -659,37 +660,27 @@ namespace SharedLibrary.Commands
await E.Target.Tell("[^3" + E.Target.Name + "^7]");
StringBuilder message = new StringBuilder();
List<Player> playerAliases = E.Owner.getPlayerAliases(E.Target);
var playerAliases = E.Owner.GetAliases(E.Target);
message.Append("Aliases: ");
foreach (Player P in playerAliases)
var names = new List<string>();
var ips = new List<string>();
foreach (var alias in playerAliases)
{
foreach (String S in P.Alias.Names)
{
if (S != String.Empty && S != E.Target.Name)
message.Append(S + " | ");
}
names.AddRange(alias.Names);
ips.AddRange(alias.IPS);
}
message.Append(String.Join(" | ", names.Distinct()));
await E.Origin.Tell(message.ToString());
message = new StringBuilder();
message.Clear();
message.Append("IPs: ");
message.Append(String.Join(" | ", ips.Distinct()));
if (E.Target.Alias.IPS != null)
{
message.Append("IPs: ");
foreach (Player P2 in playerAliases)
{
foreach (String IP in P2.Alias.IPS)
{
if (IP.Split('.').Length > 3 && IP != String.Empty && !message.ToString().Contains(IP))
message.Append (IP + " | ");
}
}
await E.Origin.Tell(message.ToString());
}
await E.Origin.Tell(message.ToString());
}
}

View File

@ -236,7 +236,8 @@ namespace SharedLibrary
public List<Player> GetRecentPlayers()
{
List<Player> returnssss = new List<Player>();
String Query = String.Format($"SELECT * FROM CLIENTS LIMIT 15 OFFSET (SELECT COUNT(*) FROM CLIENTS)-15");
//String Query = String.Format($"SELECT * FROM CLIENTS LIMIT 15 OFFSET (SELECT COUNT(*) FROM CLIENTS)-15");
String Query = "SELECT * FROM CLIENTS ORDER BY LastConnection DESC LIMIT 25";
DataTable Result = GetDataTable(Query);
if (Result != null && Result.Rows.Count > 0)

View File

@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Collections.Generic;
namespace SharedLibrary.Interfaces
{

View File

@ -38,6 +38,8 @@ namespace SharedLibrary.Network
String npID = responseLine.Substring(29, 17).Trim(); // DONT TOUCH PLZ
int.TryParse(playerInfo[0], out cID);
String cIP = responseLine.Substring(72, 20).Trim().Split(':')[0];
if (cIP.Split(' ').Count() > 1)
cIP = cIP.Split(' ')[1];
Player P = new Player(cName, npID, cID, cIP) { Ping = Ping };
StatusPlayers.Add(P);
}

View File

@ -219,7 +219,7 @@ namespace SharedLibrary
public async Task Broadcast(String Message)
{
#if DEBUG
return;
// return;
#endif
await this.ExecuteCommandAsync($"sayraw {Message}");
}
@ -232,8 +232,8 @@ namespace SharedLibrary
public async Task Tell(String Message, Player Target)
{
#if DEBUG
if (!Target.lastEvent.Remote)
return;
//if (!Target.lastEvent.Remote)
// return;
#endif
if (Target.ClientID > -1 && Message.Length > 0 && Target.Level != Player.Permission.Console && !Target.lastEvent.Remote)
await this.ExecuteCommandAsync($"tellraw {Target.ClientID} {Message}^7");