INSANEMODE/IW4M-Admin
1
0
Fork 0
mirror of https://github.com/RaidMax/IW4M-Admin.git synced 2025-06-09 23:00:57 -05:00
Code Issues Releases Wiki Activity

finer version numbers work correctly.

Browse Source 
fix bug with level being reset.
add {{ADMINS}} to message tokens
modified offset threshold calculation
This commit is contained in:
RaidMax
2018-06-26 20:17:24 -05:00
parent f73ddf5ad1
commit cd330eef97
12 changed files with 71 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
SharedLibraryCore/Commands/NativeCommands.cs
View File

@ -531,24 +531,27 @@ namespace SharedLibraryCore.Commands
base("admins", Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_ADMINS_DESC"], "a", Player.Permission.User, false)
{ }
public static string OnlineAdmins(Server S)
{
var onlineAdmins = S.GetPlayersAsList()
.Where(p => p.Level > Player.Permission.Flagged)
.Where(p => !p.Masked)
.Select(p => $"[^3{Utilities.ConvertLevelToColor(p.Level)}^7] {p.Name}");
return onlineAdmins.Count() > 0 ?
string.Join(Environment.NewLine, onlineAdmins) :
Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_ADMINS_NONE"];
}
public override async Task ExecuteAsync(GameEvent E)
{
int numOnline = 0;
for (int i = 0; i < E.Owner.Players.Count; i++)
foreach (string line in OnlineAdmins(E.Owner).Split(Environment.NewLine))
{
var P = E.Owner.Players[i];
if (P != null && P.Level > Player.Permission.Flagged && !P.Masked)
{
numOnline++;
if (E.Message[0] == '@')
await E.Owner.Broadcast(String.Format("[^3{0}^7] {1}", Utilities.ConvertLevelToColor(P.Level), P.Name));
else
await E.Origin.Tell(String.Format("[^3{0}^7] {1}", Utilities.ConvertLevelToColor(P.Level), P.Name));
}
if (E.Message[0] == '@')
await E.Owner.Broadcast(line);
else
await E.Origin.Tell(line);
}
if (numOnline == 0)
await E.Origin.Tell(Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_ADMINS_NONE"]);
}
}

7
SharedLibraryCore/Services/ClientService.cs
View File

@ -151,7 +151,7 @@ namespace SharedLibraryCore.Services
.AsNoTracking()
.Include(c => c.CurrentAlias)
.Include(c => c.AliasLink.Children)
.SingleOrDefaultAsync(c => c.NetworkId == (long)entityAttribute);
.SingleOrDefaultAsync(c => c.NetworkId == entityAttribute);
}
}
@ -164,7 +164,7 @@ namespace SharedLibraryCore.Services
.Include(c => c.AliasLink)
.Include(c => c.CurrentAlias)
.Single(e => e.ClientId == entity.ClientId);
// if their level has been changed
if (entity.Level != client.Level)
{
@ -177,8 +177,7 @@ namespace SharedLibraryCore.Services
// update all related clients level
await matchingClients.ForEachAsync(c =>
{
c.Level = (client.Level == Player.Permission.Banned) ? client.Level : entity.Level;
c.Level = entity.Level;
});
}