massive branch sync
This commit is contained in:
parent
489bbabe93
commit
b3e8ec0a08
192 changed files with 1249 additions and 1124 deletions
|
|
@ -400,7 +400,7 @@ namespace Server.Network
|
|||
if ( (msgSize / 7) > 100 )
|
||||
return;
|
||||
|
||||
ArrayList buyList = new ArrayList( msgSize/7 );
|
||||
List<BuyItemResponse> buyList = new List<BuyItemResponse>( msgSize / 7 );
|
||||
for ( ;msgSize>0;msgSize-=7)
|
||||
{
|
||||
byte layer = pvSrc.ReadByte();
|
||||
|
|
@ -442,7 +442,7 @@ namespace Server.Network
|
|||
int count = pvSrc.ReadUInt16();
|
||||
if ( count < 100 && pvSrc.Size == (1+2+4+2+(count*6)) )
|
||||
{
|
||||
ArrayList sellList = new ArrayList( count );
|
||||
List<SellItemResponse> sellList = new List<SellItemResponse>( count );
|
||||
|
||||
for (int i=0;i<count;i++)
|
||||
{
|
||||
|
|
@ -764,8 +764,8 @@ namespace Server.Network
|
|||
{
|
||||
int skillIndex;
|
||||
|
||||
try{ skillIndex = Convert.ToInt32( command.Split( ' ' )[0] ); }
|
||||
catch{ break; }
|
||||
if ( !int.TryParse( command.Split( ' ' )[0], out skillIndex ) )
|
||||
break;
|
||||
|
||||
Skills.UseSkill( m, skillIndex );
|
||||
|
||||
|
|
@ -775,8 +775,8 @@ namespace Server.Network
|
|||
{
|
||||
int booktype;
|
||||
|
||||
try{ booktype = Convert.ToInt32( command ); }
|
||||
catch{ booktype = 1; }
|
||||
if ( !int.TryParse( command, out booktype ) )
|
||||
booktype = 1;
|
||||
|
||||
EventSink.InvokeOpenSpellbookRequest( new OpenSpellbookRequestEventArgs( m, booktype ) );
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue