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

fix: Removes redundant code in GumpSystem (#1921)

Browse source
This commit is contained in:
Stefano Merotta 2024-08-10 19:20:34 +02:00 • committed by GitHub
parent 76bdc7ac02
commit aa68d96807
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 22 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

44
Projects/UOContent/Gumps/Base/GumpSystem.cs
View file

@ -24,8 +24,6 @@ namespace Server.Gumps;
public static partial class GumpSystem
{
public const int GumpCap = 512;
private static readonly Dictionary<NetState, List<BaseGump>> _gumps = [];
public static unsafe void Configure()
@ -43,8 +41,6 @@ public static partial class GumpSystem
}
}
private static T Find<T>(NetState ns) where T : BaseGump => ns != null ? Get(ns).Find<T>() : null;
private static void Remove(NetState ns, BaseGump gump)
{
if (_gumps.TryGetValue(ns, out var gumps))
@ -60,18 +56,6 @@ public static partial class GumpSystem
}
}
private static void Send(NetState ns, BaseGump gump, bool singleton)
{
if (ns.CannotSendPackets()) // Handles ns null check too
{
return;
}
Get(ns).Send(gump, singleton);
}
private static bool Close<T>(NetState ns) where T : BaseGump => ns != null && Get(ns).Close<T>();
private static NetStateGumps Get(NetState ns)
{
if (ns == null)
@ -93,28 +77,40 @@ public static partial class GumpSystem
public static bool HasGump<T>([DisallowNull] this Mobile m) where T : BaseGump
{
ArgumentNullException.ThrowIfNull(m);
return Find<T>(m.NetState) != null;
var state = m.NetState;
return state != null && Get(state).Find<T>() != null;
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static T FindGump<T>([DisallowNull] this Mobile m) where T : BaseGump
{
ArgumentNullException.ThrowIfNull(m);
return Find<T>(m.NetState);
var state = m.NetState;
return state != null ? Get(state).Find<T>() : null;
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static bool CloseGump<T>([DisallowNull] this Mobile m) where T : BaseGump
{
ArgumentNullException.ThrowIfNull(m);
return Close<T>(m.NetState);
var state = m.NetState;
return state != null && Get(state).Close<T>();
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static void SendGump([DisallowNull] this Mobile m, BaseGump g, bool singleton = false)
{
ArgumentNullException.ThrowIfNull(m);
Send(m.NetState, g, singleton);
var state = m.NetState;
if (state != null)
{
Get(state).Send(g, singleton);
}
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
@ -128,28 +124,28 @@ public static partial class GumpSystem
public static bool HasGump<T>([DisallowNull] this NetState ns) where T : BaseGump
{
ArgumentNullException.ThrowIfNull(ns);
return Find<T>(ns) != null;
return Get(ns).Find<T>() != null;
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static T FindGump<T>([DisallowNull] this NetState ns) where T : BaseGump
{
ArgumentNullException.ThrowIfNull(ns);
return Find<T>(ns);
return Get(ns).Find<T>();
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static bool CloseGump<T>([DisallowNull] this NetState ns) where T : BaseGump
{
ArgumentNullException.ThrowIfNull(ns);
return Close<T>(ns);
return Get(ns).Close<T>();
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static void SendGump([DisallowNull] this NetState ns, BaseGump g, bool singleton = false)
{
ArgumentNullException.ThrowIfNull(ns);
Send(ns, g, singleton);
Get(ns).Send(g, singleton);
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]

3
Projects/UOContent/Gumps/Base/NetStateGumps.cs
View file

@ -24,6 +24,7 @@ namespace Server.Gumps;
public readonly ref struct NetStateGumps
{
private const int GumpCap = 512;
private static readonly ILogger _logger = LogFactory.GetLogger(typeof(NetStateGumps));
private readonly List<BaseGump> _gumps;
@ -102,7 +103,7 @@ public readonly ref struct NetStateGumps
}
}
if (_gumps.Count >= GumpSystem.GumpCap)
if (_gumps.Count >= GumpCap)
{
_logger.Information("Exceeded gump cap, disconnecting...");
_state.Disconnect("Exceeded gump cap.");