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

Modernization Fixes & Updates to Default Values (#3)

Browse source
This commit is contained in:
Kamron Batman 2018-10-28 00:33:16 -07:00 • committed by GitHub
parent 445eddff68
commit dcf64091b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
768 changed files with 10507 additions and 14196 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Scripts/Misc/Assistants.cs
View file

@ -86,9 +86,6 @@ namespace Server.Misc
{
private static Dictionary<Mobile, Timer> m_Dictionary = new Dictionary<Mobile, Timer>();
private static TimerStateCallback OnHandshakeTimeout_Callback = OnHandshakeTimeout;
private static TimerStateCallback OnForceDisconnect_Callback = OnForceDisconnect;
public static void Initialize()
{
if (Settings.Enabled)
@ -112,7 +109,7 @@ namespace Server.Misc
if (m_Dictionary.TryGetValue(m, out Timer t))
t?.Stop();
m_Dictionary[m] = t = Timer.DelayCall(Settings.HandshakeTimeout, OnHandshakeTimeout_Callback, m);
m_Dictionary[m] = t = Timer.DelayCall(Settings.HandshakeTimeout, OnHandshakeTimeout, m);
t.Start();
}
}
@ -133,9 +130,9 @@ namespace Server.Misc
}
}
private static void OnHandshakeTimeout(object state)
private static void OnHandshakeTimeout(Mobile m)
{
if (!(state is Mobile m))
if (m == null)
return;
m_Dictionary.Remove(m);
@ -145,30 +142,30 @@ namespace Server.Misc
// Console.WriteLine("Player '{0}' failed to negotiate features.", m);
// }
if (m.NetState != null && m.NetState.Running)
if (m.NetState?.Running == true)
{
m.SendGump(new WarningGump(1060635, 30720, Settings.WarningMessage, 0xFFC000, 420, 250, null, null));
m.SendGump(new WarningGump(1060635, 30720, Settings.WarningMessage, 0xFFC000, 420, 250));
if (m.AccessLevel <= AccessLevel.Player)
{
Timer t;
m_Dictionary[m] = t = Timer.DelayCall(Settings.DisconnectDelay, OnForceDisconnect_Callback, m);
m_Dictionary[m] = t = Timer.DelayCall(Settings.DisconnectDelay, OnForceDisconnect, m);
t.Start();
}
}
}
private static void OnForceDisconnect(object state)
private static void OnForceDisconnect(Mobile m)
{
if (state is Mobile m)
{
if (m.NetState != null && m.NetState.Running)
m.NetState.Dispose();
if (m == null)
return;
if (m.NetState != null && m.NetState.Running)
m.NetState.Dispose();
m_Dictionary.Remove(m);
m_Dictionary.Remove(m);
Console.WriteLine("Player {0} kicked (Failed assistant handshake)", m);
}
Console.WriteLine("Player {0} kicked (Failed assistant handshake)", m);
}
private sealed class BeginHandshake : ProtocolExtension