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

Fixes exiting/crash handling/ctrl+c (#237)

Browse source 
- [X] Fixes handling of CTRL+C
- [X] Fixes crash guard (but should really be rewritten
- [X] Fixes exiting/restarting

Bumps release version
This commit is contained in:
Kamron Batman 2020-09-12 00:05:38 -07:00 • committed by GitHub
parent 76a9729f61
commit 55ae0f8778
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 216 additions and 160 deletions
Download patch file Download diff file Expand all files Collapse all files

88
Projects/Server/Network/NetState.cs
View file

@ -181,36 +181,71 @@ namespace Server.Network
m_Version = value;
if (value >= m_Version70610)
{
ProtocolChanges = ProtocolChanges.Version70610;
}
if (value >= m_Version70500)
{
ProtocolChanges = ProtocolChanges.Version70500;
}
if (value >= m_Version704565)
{
ProtocolChanges = ProtocolChanges.Version704565;
}
else if (value >= m_Version70331)
{
ProtocolChanges = ProtocolChanges.Version70331;
}
else if (value >= m_Version70300)
{
ProtocolChanges = ProtocolChanges.Version70300;
}
else if (value >= m_Version70160)
{
ProtocolChanges = ProtocolChanges.Version70160;
}
else if (value >= m_Version70130)
{
ProtocolChanges = ProtocolChanges.Version70130;
}
else if (value >= m_Version7090)
{
ProtocolChanges = ProtocolChanges.Version7090;
}
else if (value >= m_Version7000)
{
ProtocolChanges = ProtocolChanges.Version7000;
}
else if (value >= m_Version60142)
{
ProtocolChanges = ProtocolChanges.Version60142;
}
else if (value >= m_Version6017)
{
ProtocolChanges = ProtocolChanges.Version6017;
}
else if (value >= m_Version6000)
{
ProtocolChanges = ProtocolChanges.Version6000;
}
else if (value >= m_Version502b)
{
ProtocolChanges = ProtocolChanges.Version502b;
}
else if (value >= m_Version500a)
{
ProtocolChanges = ProtocolChanges.Version500a;
}
else if (value >= m_Version407a)
{
ProtocolChanges = ProtocolChanges.Version407a;
else if (value >= m_Version400a) ProtocolChanges = ProtocolChanges.Version400a;
}
else if (value >= m_Version400a)
{
ProtocolChanges = ProtocolChanges.Version400a;
}
}
}
@ -275,7 +310,9 @@ namespace Server.Network
var info = ExpansionInfo.Table[i];
if (info.RequiredClient != null && Version >= info.RequiredClient || (Flags & info.ClientFlags) != 0)
{
return info;
}
}
return ExpansionInfo.GetInfo(Expansion.None);
@ -292,21 +329,31 @@ namespace Server.Network
{
for (var i = Trades.Count - 1; i >= 0; --i)
{
if (i >= Trades.Count) continue;
if (i >= Trades.Count)
{
continue;
}
var trade = Trades[i];
if (trade.From.Mobile.Deleted || trade.To.Mobile.Deleted || !trade.From.Mobile.Alive ||
!trade.To.Mobile.Alive || !trade.From.Mobile.InRange(trade.To.Mobile, 2) ||
trade.From.Mobile.Map != trade.To.Mobile.Map) trade.Cancel();
trade.From.Mobile.Map != trade.To.Mobile.Map)
{
trade.Cancel();
}
}
}
public void CancelAllTrades()
{
for (var i = Trades.Count - 1; i >= 0; --i)
{
if (i < Trades.Count)
{
Trades[i].Cancel();
}
}
}
public void RemoveTrade(SecureTrade trade)
@ -320,7 +367,10 @@ namespace Server.Network
{
var trade = Trades[i];
if (trade.From.Mobile == m || trade.To.Mobile == m) return trade;
if (trade.From.Mobile == m || trade.To.Mobile == m)
{
return trade;
}
}
return null;
@ -335,9 +385,15 @@ namespace Server.Network
var from = trade.From;
var to = trade.To;
if (from.Mobile == Mobile && to.Mobile == m) return from.Container;
if (from.Mobile == Mobile && to.Mobile == m)
{
return @from.Container;
}
if (from.Mobile == m && to.Mobile == Mobile) return to.Container;
if (from.Mobile == m && to.Mobile == Mobile)
{
return to.Container;
}
}
return null;
@ -521,21 +577,29 @@ namespace Server.Network
while (true)
{
if (AsyncState.Paused)
{
continue;
}
var result = await inPipe.ReadAsync();
if (result.IsCanceled || result.IsCompleted)
{
return;
}
var seq = result.Buffer;
if (seq.IsEmpty)
{
break;
}
var pos = PacketHandlers.ProcessPacket(messagePumpService, this, seq);
if (pos <= 0)
{
break;
}
inPipe.AdvanceTo(seq.Slice(0, pos).End);
}
@ -545,9 +609,9 @@ namespace Server.Network
Console.WriteLine(ex);
TraceException(ex);
}
catch (Exception ex)
catch
{
Console.WriteLine(ex);
// Console.WriteLine(ex);
}
finally
{
@ -595,7 +659,9 @@ namespace Server.Network
{
var disposing = Interlocked.Exchange(ref m_Disposing, 1);
if (disposing == 1)
{
return;
}
try
{
@ -620,7 +686,9 @@ namespace Server.Network
while (breakout++ < 200)
{
if (!m_Disposed.TryDequeue(out var ns))
{
break;
}
var m = ns.Mobile;
var a = ns.Account;
@ -639,9 +707,13 @@ namespace Server.Network
ns.CityInfo = null;
if (a != null)
{
ns.WriteConsole("Disconnected. [{0} Online] [{1}]", TcpServer.Instances.Count, a);
}
else
{
ns.WriteConsole("Disconnected. [{0} Online]", TcpServer.Instances.Count);
}
}
}