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

Partial Branch Sync

Browse source
This commit is contained in:
mark 2007-08-27 08:49:15 +00:00
parent 4718a4b911
commit 1ef98f10ec
32 changed files with 166 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Server/EventSink.cs
View file

@ -72,9 +72,9 @@ namespace Server
public delegate BaseGuild CreateGuildHandler( CreateGuildEventArgs e );
public delegate void GuildGumpRequestHandler( GuildGumpRequestArgs e );
public delegate void QuestGumpRequestHandler( QuestGumpRequestArgs e );
public delegate void ClientVersionRecievedHandler( ClientVersionRecievedArgs e );
public delegate void ClientVersionReceivedHandler( ClientVersionReceivedArgs e );
public class ClientVersionRecievedArgs : EventArgs
public class ClientVersionReceivedArgs : EventArgs
{
private NetState m_State;
private ClientVersion m_Version;
@ -82,7 +82,7 @@ namespace Server
public NetState State { get { return m_State; } }
public ClientVersion Version { get { return m_Version; } }
public ClientVersionRecievedArgs( NetState state, ClientVersion cv )
public ClientVersionReceivedArgs( NetState state, ClientVersion cv )
{
m_State = state;
m_Version = cv;
@ -832,12 +832,12 @@ namespace Server
public static event ServerStartedEventHandler ServerStarted;
public static event GuildGumpRequestHandler GuildGumpRequest;
public static event QuestGumpRequestHandler QuestGumpRequest;
public static event ClientVersionRecievedHandler ClientVersionRecieved;
public static event ClientVersionReceivedHandler ClientVersionReceived;
public static void InvokeClientVersionRecieved( ClientVersionRecievedArgs e )
public static void InvokeClientVersionReceived( ClientVersionReceivedArgs e )
{
if( ClientVersionRecieved != null )
ClientVersionRecieved( e );
if( ClientVersionReceived != null )
ClientVersionReceived( e );
}
public static void InvokeServerStarted()

2
Server/Main.cs
View file

@ -346,6 +346,8 @@ namespace Server
if( SocketPool.Created )
SocketPool.Destroy();
Timer.Set();
Console.WriteLine( "done" );
}

6
Server/Network/NetState.cs
View file

@ -512,7 +512,8 @@ namespace Server.Network {
private static BufferPool m_ReceiveBufferPool = new BufferPool( "Receive", 2048, 2048 );
public NetState( Socket socket, MessagePump messagePump ) {
public NetState( Socket socket, MessagePump messagePump )
{
m_Socket = socket;
m_Buffer = new ByteQueue();
m_Seeded = false;
@ -541,7 +542,8 @@ namespace Server.Network {
m_ConnectedOn = DateTime.Now;
if ( m_CreatedCallback != null ) {
if ( m_CreatedCallback != null )
{
m_CreatedCallback( this );
}
}

2
Server/Network/PacketHandlers.cs
View file

@ -1811,7 +1811,7 @@ namespace Server.Network
{
CV version = state.Version = new CV( pvSrc.ReadString() );
EventSink.InvokeClientVersionRecieved( new ClientVersionRecievedArgs( state, version ) );
EventSink.InvokeClientVersionReceived( new ClientVersionReceivedArgs( state, version ) );
}
public static void MobileQuery( NetState state, PacketReader pvSrc )

5
Server/Timer.cs
View file

@ -317,6 +317,7 @@ namespace Server
}
private static AutoResetEvent m_Signal = new AutoResetEvent( true );
public static void Set() { m_Signal.Set(); }
public void TimerMain()
{
@ -324,10 +325,8 @@ namespace Server
int i, j;
bool loaded;
while ( !Core.Closing )
while ( m_Signal.WaitOne( 10, false ) && !Core.Closing )
{
m_Signal.WaitOne( 10, false );
ProcessChangeQueue();
loaded = false;