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

general cleanup, fixed a slightly improbably crash issue

Browse source
This commit is contained in:
mark 2007-08-12 07:19:44 +00:00
parent 6780b3c2e7
commit b9e3476d8b
26 changed files with 62 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Server/Items/Container.cs
View file

@ -1659,7 +1659,7 @@ namespace Server.Items
to.Send( new ContainerDisplay( this ) );
if ( to.NetState.IsPost6017 )
if ( to.NetState != null && to.NetState.IsPost6017 )
to.Send( new ContainerContent6017( to, this ) );
else
to.Send( new ContainerContent( to, this ) );

4
Server/Main.cs
View file

@ -461,10 +461,8 @@ namespace Server
int sample = 0;
while( true )
while( m_Signal.WaitOne() )
{
m_Signal.WaitOne();
Mobile.ProcessDeltaQueue();
Item.ProcessDeltaQueue();

11
Server/SecureTrade.cs
View file

@ -209,14 +209,17 @@ namespace Server
m_From = new SecureTradeInfo( this, from, new SecureTradeContainer( this ) );
m_To = new SecureTradeInfo( this, to, new SecureTradeContainer( this ) );
bool from6017 = ( from.NetState == null ? false : from.NetState.IsPost6017 );
bool to6017 = ( to.NetState == null ? false : to.NetState.IsPost6017 );
from.Send( new MobileStatus( from, to ) );
from.Send( new UpdateSecureTrade( m_From.Container, false, false ) );
if ( from.NetState.IsPost6017 )
if ( from6017 )
from.Send( new SecureTradeEquip6017( m_To.Container, to ) );
else
from.Send( new SecureTradeEquip( m_To.Container, to ) );
from.Send( new UpdateSecureTrade( m_From.Container, false, false ) );
if ( from.NetState.IsPost6017 )
if ( from6017 )
from.Send( new SecureTradeEquip6017( m_From.Container, from ) );
else
from.Send( new SecureTradeEquip( m_From.Container, from ) );
@ -225,12 +228,12 @@ namespace Server
to.Send( new MobileStatus( to, from ) );
to.Send( new UpdateSecureTrade( m_To.Container, false, false ) );
if ( to.NetState.IsPost6017 )
if ( to6017 )
to.Send( new SecureTradeEquip6017( m_From.Container, from ) );
else
to.Send( new SecureTradeEquip( m_From.Container, from ) );
to.Send( new UpdateSecureTrade( m_To.Container, false, false ) );
if ( to.NetState.IsPost6017 )
if ( to6017 )
to.Send( new SecureTradeEquip6017( m_To.Container, to ) );
else
to.Send( new SecureTradeEquip( m_To.Container, to ) );