warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Exclude higher privileged mobiles in AdminGump (#1423)

Browse source 
---------

Co-authored-by: Kamron Batman <3953314+kamronbatman@users.noreply.github.com>
This commit is contained in:
Mink80 2023-07-16 07:12:38 +02:00 • committed by GitHub
parent e9fa2bf9fa
commit d65e5bb37b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Projects/UOContent/Gumps/AdminGump.cs
View file

@ -87,6 +87,8 @@ namespace Server.Gumps
m_State = state; m_State = state;
m_List = list; m_List = list;
FilterAccess(m_List, from);
AddPage(0); AddPage(0);
AddBackground(0, 0, 420, 440, 5054); AddBackground(0, 0, 420, 440, 5054);
@ -434,6 +436,7 @@ namespace Server.Gumps
states.Sort(NetStateComparer.Instance); states.Sort(NetStateComparer.Instance);
m_List = states.ToList<object>(); m_List = states.ToList<object>();
FilterAccess(m_List, from);
} }
AddClientHeader(); AddClientHeader();
@ -528,6 +531,13 @@ namespace Server.Gumps
AddLabel(20, y, LabelHue, "Account:"); AddLabel(20, y, LabelHue, "Account:");
AddLabel(200, y, a?.Banned == true ? RedHue : LabelHue, a == null ? "(no account)" : a.Username); AddLabel(200, y, a?.Banned == true ? RedHue : LabelHue, a == null ? "(no account)" : a.Username);
if (m.AccessLevel > from.AccessLevel || a?.AccessLevel > from.AccessLevel)
{
AddLabel(20, y + 20, LabelHue, "You do not have permission to view this client's information.");
break;
}
AddButton(380, y, 0xFA5, 0xFA7, GetButtonID(7, 14)); AddButton(380, y, 0xFA5, 0xFA7, GetButtonID(7, 14));
y += 20; y += 20;
@ -3768,7 +3778,8 @@ namespace Server.Gumps
} }
case 7: case 7:
{ {
if (m_State is not Mobile m) if (m_State is not Mobile m ||
m.AccessLevel > from.AccessLevel || m.Account?.AccessLevel > from.AccessLevel)
{ {
break; break;
} }
@ -4123,6 +4134,27 @@ namespace Server.Gumps
} }
} }
private static void FilterAccess(List<object> list, Mobile from)
{
if (list == null || list.Count == 0)
{
return;
}
for (var i = list.Count - 1; i >= 0; i--)
{
var obj = list[i];
if (obj is Account acc && acc.AccessLevel > from.AccessLevel ||
obj is Mobile mob && mob.AccessLevel > from.AccessLevel ||
obj is NetState ns &&
(ns.Mobile.AccessLevel > from.AccessLevel || ns.Account.AccessLevel > from.AccessLevel))
{
list.RemoveAt(i);
}
}
}
private class SharedAccountDescendingComparer : IComparer<object> private class SharedAccountDescendingComparer : IComparer<object>
{ {
public static readonly IComparer<object> Instance = new SharedAccountDescendingComparer(); public static readonly IComparer<object> Instance = new SharedAccountDescendingComparer();