@@ -714,7 +714,7 @@ internal static PlayerInfo LoadFormat2( string[] fields, int count ) {
714714 Int32 . TryParse ( fields [ 59 ] , out info . DemoCount ) ;
715715 }
716716
717- if ( count > 60 ) info . Model = fields [ 60 ] ;
717+ if ( count > 60 ) info . Model = PlayerDB . Unescape ( fields [ 60 ] ) ;
718718
719719 if ( count > 61 )
720720 {
@@ -743,36 +743,26 @@ internal static PlayerInfo LoadFormat2( string[] fields, int count ) {
743743 short . TryParse ( fields [ 68 ] , out info . JumpHeight ) ;
744744 }
745745
746- if ( count > 69 )
747- info . GeoIP = fields [ 69 ] ;
748- if ( count > 70 )
749- info . CountryCode = fields [ 70 ] ;
750- if ( count > 71 )
751- info . CountryName = fields [ 71 ] ;
746+ if ( count > 69 ) info . GeoIP = fields [ 69 ] ;
747+ if ( count > 70 ) info . CountryCode = fields [ 70 ] ;
748+ if ( count > 71 ) info . CountryName = fields [ 71 ] ;
752749 //if (count > 72) info.RegionCode = fields[72];
753750 //if (count > 73) info.RegionName = fields[73];
754751 //if (count > 74) info.City = fields[74];
755752 //if (count > 75) info.ZipCode = fields[75];
756- if ( count > 76 )
757- info . Latitude = fields [ 76 ] ;
758- if ( count > 77 )
759- info . Longitude = fields [ 77 ] ;
753+ if ( count > 76 ) info . Latitude = fields [ 76 ] ;
754+ if ( count > 77 ) info . Longitude = fields [ 77 ] ;
760755 //if (count > 78) info.MetroCode = fields[78];
761756 //if (count > 79) info.AreaCode = fields[79];
762- if ( count > 80 )
763- info . TimeZone = fields [ 80 ] ;
764-
765- if ( count > 81 )
766- info . skinName = fields [ 81 ] ;
767-
768- if ( count > 82 )
769- info . Subdivision = PlayerDB . Unescape ( fields [ 82 ] ) . Split ( ) ;
770- if ( count > 83 )
771- byte . TryParse ( fields [ 83 ] , out info . Accuracy ) ;
772- if ( count > 84 )
773- info . Hostname = fields [ 84 ] ;
774- if ( count > 85 )
775- info . Continent = fields [ 85 ] ;
757+ if ( count > 80 ) info . TimeZone = fields [ 80 ] ;
758+
759+ if ( count > 81 ) info . skinName = PlayerDB . Unescape ( fields [ 81 ] ) ;
760+
761+ if ( count > 82 ) info . Subdivision = PlayerDB . Unescape ( fields [ 82 ] ) . Split ( ) ;
762+ if ( count > 83 ) byte . TryParse ( fields [ 83 ] , out info . Accuracy ) ;
763+ if ( count > 84 ) info . Hostname = fields [ 84 ] ;
764+ if ( count > 85 ) info . Continent = fields [ 85 ] ;
765+
776766 if ( count > 86 ) {
777767 if ( ! bool . TryParse ( fields [ 86 ] , out info . ClassicubeVerified ) )
778768 info . ClassicubeVerified = true ;
@@ -1229,7 +1219,7 @@ internal void Serialize( StringBuffer sb ) {
12291219 sb . Append ( DemoCount ) ; // 59
12301220 sb . Append ( ',' ) ;
12311221
1232- sb . Append ( Model ) ; // 60
1222+ sb . AppendEscaped ( Model ) ; // 60
12331223 sb . Append ( ',' ) ;
12341224
12351225 sb . Append ( ReachDistance ) ; // 61
@@ -1283,7 +1273,7 @@ internal void Serialize( StringBuffer sb ) {
12831273 sb . Append ( TimeZone ) ; // 80
12841274
12851275 sb . Append ( ',' ) ;
1286- sb . Append ( skinName ) ; // 81
1276+ sb . AppendEscaped ( skinName ) ; // 81
12871277
12881278
12891279 sb . Append ( ',' ) ;
0 commit comments