massive branch sync

This commit is contained in:
mark 2010-04-25 06:09:43 +00:00
parent 489bbabe93
commit b3e8ec0a08
192 changed files with 1249 additions and 1124 deletions

View file

@ -2353,11 +2353,9 @@ namespace Server.Gumps
{
ArrayList results = new ArrayList();
DateTime minTime = DateTime.Now - Account.InactiveDuration;
foreach ( Account acct in Accounts.GetAccounts() )
{
if ( acct.LastLogin <= minTime )
if ( acct.Inactive )
results.Add( acct );
}

View file

@ -17,7 +17,7 @@ namespace Server.Guilds
{
m_ToLeader = toPromoteToLeader;
m_toKick = toKick;
m_Member = (PlayerMobile)member;
m_Member = member;
PopulateGump();
}

View file

@ -284,14 +284,8 @@ namespace Server.Gumps
int price;
try
{
price = Convert.ToInt32( text );
}
catch
{
price = -1;
}
if ( !int.TryParse( text, out price ) )
price = -1;
if ( price < 0 )
{
@ -512,14 +506,8 @@ namespace Server.Gumps
int price;
try
{
price = Convert.ToInt32( text );
}
catch
{
price = -1;
}
if ( !int.TryParse( text, out price ) )
price = -1;
if ( price < 0 )
{