diff --git a/Server/Serialization.cs b/Server/Serialization.cs index c505c94a9..2832a6e42 100644 --- a/Server/Serialization.cs +++ b/Server/Serialization.cs @@ -1,4 +1,3 @@ -//07MAR2007 Update for Linux - seirge /*************************************************************************** * Serialization.cs * ------------------- @@ -66,16 +65,10 @@ namespace Server public abstract Item ReadItem(); public abstract Mobile ReadMobile(); public abstract BaseGuild ReadGuild(); -#if MONO - public abstract T ReadItemG() where T : Item; - public abstract T ReadMobileG() where T : Mobile; - public abstract T ReadGuildG() where T : BaseGuild; -#else + public abstract T ReadItem() where T : Item; public abstract T ReadMobile() where T : Mobile; public abstract T ReadGuild() where T : BaseGuild; -#endif - public abstract ArrayList ReadItemList(); public abstract ArrayList ReadMobileList(); @@ -986,192 +979,161 @@ namespace Server { return BaseGuild.Find( ReadInt() ); } -#if MONO - public override T ReadItemG() - { - return ReadItem() as T; - } -#else + public override T ReadItem() { return ReadItem() as T; } -#endif -#if MONO - public override T ReadMobileG() - { - return ReadMobile() as T; - } -#else public override T ReadMobile() { return ReadMobile() as T; } -#endif -#if MONO - public override T ReadGuildG() - { - return ReadGuild() as T; - } -#else public override T ReadGuild() { return ReadGuild() as T; } -#endif + public override ArrayList ReadItemList() { int count = ReadInt(); - ArrayList list = new ArrayList( count ); + if ( count > 0 ) { + ArrayList list = new ArrayList( count ); - for( int i = 0; i < count; ++i ) - { - Item item = ReadItem(); + for ( int i = 0; i < count; ++i ) { + Item item = ReadItem(); - if( item != null ) - list.Add( item ); + if ( item != null ) { + list.Add( item ); + } + } + + return list; + } else { + return new ArrayList(); } - - return list; } public override ArrayList ReadMobileList() { int count = ReadInt(); - ArrayList list = new ArrayList( count ); + if ( count > 0 ) { + ArrayList list = new ArrayList( count ); - for( int i = 0; i < count; ++i ) - { - Mobile m = ReadMobile(); + for ( int i = 0; i < count; ++i ) { + Mobile m = ReadMobile(); - if( m != null ) - list.Add( m ); + if ( m != null ) { + list.Add( m ); + } + } + + return list; + } else { + return new ArrayList(); } - - return list; } public override ArrayList ReadGuildList() { int count = ReadInt(); - ArrayList list = new ArrayList( count ); + if ( count > 0 ) { + ArrayList list = new ArrayList( count ); - for( int i = 0; i < count; ++i ) - { - BaseGuild g = ReadGuild(); + for ( int i = 0; i < count; ++i ) { + BaseGuild g = ReadGuild(); - if( g != null ) - list.Add( g ); + if ( g != null ) { + list.Add( g ); + } + } + + return list; + } else { + return new ArrayList(); } - - return list; } public override List ReadStrongItemList() { - int count = ReadInt(); - - List list = new List( count ); - - for( int i = 0; i < count; ++i ) - { - Item item = ReadItem(); - - if( item != null ) - list.Add( item ); - } - - return list; + return ReadStrongItemList(); } public override List ReadStrongItemList() { int count = ReadInt(); - List list = new List( count ); + if ( count > 0 ) { + List list = new List( count ); - for( int i = 0; i < count; ++i ) - { - T item = ReadItem() as T; + for ( int i = 0; i < count; ++i ) { + T item = ReadItem() as T; - if( item != null ) - list.Add( item ); + if ( item != null ) { + list.Add( item ); + } + } + + return list; + } else { + return new List(); } - - return list; } public override List ReadStrongMobileList() { - int count = ReadInt(); - - List list = new List( count ); - - for( int i = 0; i < count; ++i ) - { - Mobile m = ReadMobile(); - - if( m != null ) - list.Add( m ); - } - - return list; + return ReadStrongMobileList(); } public override List ReadStrongMobileList() { int count = ReadInt(); - List list = new List( count ); + if ( count > 0 ) { + List list = new List( count ); - for( int i = 0; i < count; ++i ) - { - T m = ReadMobile() as T; + for ( int i = 0; i < count; ++i ) { + T m = ReadMobile() as T; - if( m != null ) - list.Add( m ); + if ( m != null ) { + list.Add( m ); + } + } + + return list; + } else { + return new List(); } - - return list; } public override List ReadStrongGuildList() { - int count = ReadInt(); - - List list = new List( count ); - - for( int i = 0; i < count; ++i ) - { - BaseGuild g = ReadGuild(); - - if( g != null ) - list.Add( g ); - } - - return list; + return ReadStrongGuildList(); } public override List ReadStrongGuildList() { int count = ReadInt(); - List list = new List( count ); + if ( count > 0 ) { + List list = new List( count ); - for( int i = 0; i < count; ++i ) - { - T g = ReadGuild() as T; + for ( int i = 0; i < count; ++i ) { + T g = ReadGuild() as T; - if( g != null ) - list.Add( g ); + if ( g != null ) { + list.Add( g ); + } + } + + return list; + } else { + return new List(); } - - return list; } public override bool End() @@ -1752,5 +1714,4 @@ namespace Server int SerialIdentity { get; } void Serialize( GenericWriter writer ); } -} - +} \ No newline at end of file