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

Rewrite exit code, shutdown handlers etc

Browse source
This commit is contained in:
mark 2007-07-29 00:58:34 +00:00
parent b1a05c68dd
commit 9e586bf2f3
6 changed files with 33 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Server/Main.cs
View file

@ -276,8 +276,10 @@ namespace Server
{
if( World.Saving )
return true;
Kill();
return false;
return true;
}
#endif
@ -287,8 +289,7 @@ namespace Server
}
private static bool m_Closing;
public static bool Closing { get { return m_Closing; } set { m_Closing = value; } }
public static bool Closing { get { return m_Closing; } }
private static uint m_CycleIndex;
private static float[] m_CyclesPerSecond = new float[100];
@ -315,6 +316,21 @@ namespace Server
}
}
public static void Kill()
{
Kill( false );
}
public static void Kill( bool restart )
{
HandleClosed();
if ( restart )
Process.Start( ExePath, Arguments );
m_Process.Kill();
}
private static void HandleClosed()
{
if( m_Closing )
@ -327,9 +343,6 @@ namespace Server
if( !m_Crashed )
EventSink.InvokeShutdown( new ShutdownEventArgs() );
if( timerThread.ThreadState != System.Threading.ThreadState.Unstarted )
timerThread.Join();
if( SocketPool.Created )
SocketPool.Destroy();
@ -448,7 +461,7 @@ namespace Server
int sample = 0;
while( !m_Closing )
while( true )
{
m_Signal.WaitOne();
@ -477,9 +490,6 @@ namespace Server
{
CurrentDomain_UnhandledException( null, new UnhandledExceptionEventArgs( e, true ) );
}
if( timerThread.IsAlive )
timerThread.Abort();
}
public static string Arguments

2
Server/Mobile.cs
View file

@ -7926,7 +7926,7 @@ namespace Server
return this == m || (
m.m_Map == m_Map &&
(!m.Hidden || (m_AccessLevel != AccessLevel.Player && (m_AccessLevel >= m.AccessLevel || m_AccessLevel >= AccessLevel.Administrator))) && //Admins/devs can still see/find eachother though admin gump, they should be able to see 'em too.
(!m.Hidden || (m_AccessLevel != AccessLevel.Player && (m_AccessLevel >= m.AccessLevel || m_AccessLevel >= AccessLevel.Developer))) &&
((m.Alive || (Core.SE && Skills.SpiritSpeak.Value >= 100.0)) || !Alive || m_AccessLevel > AccessLevel.Player || m.Warmode));
}