Fixes code according to modern code style. Fixes a few expression bugs.

This commit is contained in:
Kamron Batman 2018-09-15 09:58:51 -07:00
parent 89eea25e5f
commit 970fd563b2
3324 changed files with 441118 additions and 433755 deletions

View file

@ -1,63 +1,63 @@
namespace Server.Regions
{
[TypeAlias( "Server.Regions.SpawnPersistance" )]
public class SpawnPersistence : Item
{
private static SpawnPersistence m_Instance;
[TypeAlias("Server.Regions.SpawnPersistance")]
public class SpawnPersistence : Item
{
private static SpawnPersistence m_Instance;
public SpawnPersistence Instance => m_Instance;
private SpawnPersistence() : base(1)
{
Movable = false;
}
public static void EnsureExistence()
{
if ( m_Instance == null )
m_Instance = new SpawnPersistence();
}
public SpawnPersistence(Serial serial) : base(serial)
{
m_Instance = this;
}
public override string DefaultName => "Region spawn persistence - Internal";
public SpawnPersistence Instance => m_Instance;
private SpawnPersistence() : base( 1 )
{
Movable = false;
}
public override string DefaultName => "Region spawn persistence - Internal";
public SpawnPersistence( Serial serial ) : base( serial )
{
m_Instance = this;
}
public static void EnsureExistence()
{
if (m_Instance == null)
m_Instance = new SpawnPersistence();
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.WriteEncodedInt( 0 ); // version
writer.WriteEncodedInt(0); // version
writer.Write( (int) SpawnEntry.Table.Values.Count );
foreach ( SpawnEntry entry in SpawnEntry.Table.Values )
{
writer.Write( (int) entry.ID );
writer.Write(SpawnEntry.Table.Values.Count);
foreach (SpawnEntry entry in SpawnEntry.Table.Values)
{
writer.Write(entry.ID);
entry.Serialize( writer );
}
}
entry.Serialize(writer);
}
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadEncodedInt();
int version = reader.ReadEncodedInt();
int count = reader.ReadInt();
for ( int i = 0; i < count; i++ )
{
int id = reader.ReadInt();
int count = reader.ReadInt();
for (int i = 0; i < count; i++)
{
int id = reader.ReadInt();
SpawnEntry entry = (SpawnEntry) SpawnEntry.Table[id];
SpawnEntry entry = (SpawnEntry)SpawnEntry.Table[id];
if ( entry != null )
entry.Deserialize( reader, version );
else
SpawnEntry.Remove( reader, version );
}
}
}
}
if (entry != null)
entry.Deserialize(reader, version);
else
SpawnEntry.Remove(reader, version);
}
}
}
}