warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changes properties to use automatic property initializers

Browse source
This commit is contained in:
Kamron Batman 2018-09-14 15:23:29 -07:00
parent f0a48ad431
commit 06fa31a7bf
623 changed files with 13072 additions and 19304 deletions
Download patch file Download diff file Expand all files Collapse all files

48
Scripts/Engines/ConPVP/Preferences.cs
View file

@ -69,10 +69,9 @@ namespace Server.Engines.ConPVP
public class Preferences
{
private ArrayList m_Entries;
private Hashtable m_Table;
public ArrayList Entries => m_Entries;
public ArrayList Entries { get; }
public PreferencesEntry Find( Mobile mob )
{
@ -81,22 +80,18 @@ namespace Server.Engines.ConPVP
if ( entry == null )
{
m_Table[mob] = entry = new PreferencesEntry( mob, this );
m_Entries.Add( entry );
Entries.Add( entry );
}
return entry;
}
private static Preferences m_Instance;
public static Preferences Instance{ get => m_Instance;
set => m_Instance = value;
}
public static Preferences Instance { get; set; }
public Preferences()
{
m_Table = new Hashtable();
m_Entries = new ArrayList();
Entries = new ArrayList();
}
public Preferences( GenericReader reader )
@ -110,7 +105,7 @@ namespace Server.Engines.ConPVP
int count = reader.ReadEncodedInt();
m_Table = new Hashtable( count );
m_Entries = new ArrayList( count );
Entries = new ArrayList( count );
for ( int i = 0; i < count; ++i )
{
@ -119,7 +114,7 @@ namespace Server.Engines.ConPVP
if ( entry.Mobile != null )
{
m_Table[entry.Mobile] = entry;
m_Entries.Add( entry );
Entries.Add( entry );
}
}
@ -132,27 +127,26 @@ namespace Server.Engines.ConPVP
{
writer.WriteEncodedInt( (int) 0 ); // version;
writer.WriteEncodedInt( (int) m_Entries.Count );
writer.WriteEncodedInt( (int) Entries.Count );
for ( int i = 0; i < m_Entries.Count; ++i )
((PreferencesEntry)m_Entries[i]).Serialize( writer );
for ( int i = 0; i < Entries.Count; ++i )
((PreferencesEntry)Entries[i]).Serialize( writer );
}
}
public class PreferencesEntry
{
private Mobile m_Mobile;
private ArrayList m_Disliked;
private Preferences m_Preferences;
public Mobile Mobile => m_Mobile;
public ArrayList Disliked => m_Disliked;
public Mobile Mobile { get; }
public ArrayList Disliked { get; }
public PreferencesEntry( Mobile mob, Preferences prefs )
{
m_Preferences = prefs;
m_Mobile = mob;
m_Disliked = new ArrayList();
Mobile = mob;
Disliked = new ArrayList();
}
public PreferencesEntry( GenericReader reader, Preferences prefs, int version )
@ -163,14 +157,14 @@ namespace Server.Engines.ConPVP
{
case 0:
{
m_Mobile = reader.ReadMobile();
Mobile = reader.ReadMobile();
int count = reader.ReadEncodedInt();
m_Disliked = new ArrayList( count );
Disliked = new ArrayList( count );
for ( int i = 0; i < count; ++i )
m_Disliked.Add( reader.ReadString() );
Disliked.Add( reader.ReadString() );
break;
}
@ -179,12 +173,12 @@ namespace Server.Engines.ConPVP
public void Serialize( GenericWriter writer )
{
writer.Write( (Mobile) m_Mobile );
writer.Write( (Mobile) Mobile );
writer.WriteEncodedInt( (int) m_Disliked.Count );
writer.WriteEncodedInt( (int) Disliked.Count );
for ( int i = 0; i < m_Disliked.Count; ++i )
writer.Write( (string) m_Disliked[i] );
for ( int i = 0; i < Disliked.Count; ++i )
writer.Write( (string) Disliked[i] );
}
}