GitHub/Facepunch.Steamworks
2
0
Fork 0
mirror of https://github.com/Facepunch/Facepunch.Steamworks.git synced 2025-02-03 09:10:41 +03:00
Code Issues Projects Releases Wiki Activity

Allow & ignore errors when parsing exchange string

Browse Source
This commit is contained in:
Garry Newman 2016-11-21 20:41:30 +00:00
parent 5cef85adb4
commit 74ef4d49ad
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Facepunch.Steamworks/Interfaces/Inventory.Definition.cs
View File

@ -238,15 +238,28 @@ namespace Facepunch.Steamworks
var i = new Ingredient(); var i = new Ingredient();
i.Count = 1; i.Count = 1;
if ( part.Contains( 'x' ) ) try
{ {
var idx = part.IndexOf( 'x' );
i.Count = int.Parse( part.Substring( idx + 1 ) );
part = part.Substring( 0, idx );
}
i.DefinitionId = int.Parse( part ); if ( part.Contains( 'x' ) )
i.Definition = definitions.FirstOrDefault( x => x.Id == i.DefinitionId ); {
var idx = part.IndexOf( 'x' );
int count = 0;
if ( int.TryParse( part.Substring( idx + 1 ), out count ) )
i.Count = count;
part = part.Substring( 0, idx );
}
i.DefinitionId = int.Parse( part );
i.Definition = definitions.FirstOrDefault( x => x.Id == i.DefinitionId );
}
catch ( System.Exception )
{
return i;
}
return i; return i;
} }
@ -268,7 +281,7 @@ namespace Facepunch.Steamworks
r.Result = Result; r.Result = Result;
var parts = part.Split( new[] { ',' }, StringSplitOptions.RemoveEmptyEntries ); var parts = part.Split( new[] { ',' }, StringSplitOptions.RemoveEmptyEntries );
r.Ingredients = parts.Select( x => Ingredient.FromString( x, definitions ) ).ToArray(); r.Ingredients = parts.Select( x => Ingredient.FromString( x, definitions ) ).Where( x => x.DefinitionId != 0 ).ToArray();
foreach ( var i in r.Ingredients ) foreach ( var i in r.Ingredients )
{ {