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

@ -20,56 +20,56 @@
namespace Server.Network
{
public class EncodedReader
{
private PacketReader m_Reader;
public class EncodedReader
{
private PacketReader m_Reader;
public EncodedReader( PacketReader reader )
{
m_Reader = reader;
}
public EncodedReader(PacketReader reader)
{
m_Reader = reader;
}
public byte[] Buffer => m_Reader.Buffer;
public byte[] Buffer => m_Reader.Buffer;
public void Trace( NetState state )
{
m_Reader.Trace( state );
}
public void Trace(NetState state)
{
m_Reader.Trace(state);
}
public int ReadInt32()
{
if ( m_Reader.ReadByte() != 0 )
return 0;
public int ReadInt32()
{
if (m_Reader.ReadByte() != 0)
return 0;
return m_Reader.ReadInt32();
}
return m_Reader.ReadInt32();
}
public Point3D ReadPoint3D()
{
if ( m_Reader.ReadByte() != 3 )
return Point3D.Zero;
public Point3D ReadPoint3D()
{
if (m_Reader.ReadByte() != 3)
return Point3D.Zero;
return new Point3D( m_Reader.ReadInt16(), m_Reader.ReadInt16(), m_Reader.ReadByte() );
}
return new Point3D(m_Reader.ReadInt16(), m_Reader.ReadInt16(), m_Reader.ReadByte());
}
public string ReadUnicodeStringSafe()
{
if ( m_Reader.ReadByte() != 2 )
return "";
public string ReadUnicodeStringSafe()
{
if (m_Reader.ReadByte() != 2)
return "";
int length = m_Reader.ReadUInt16();
int length = m_Reader.ReadUInt16();
return m_Reader.ReadUnicodeStringSafe( length );
}
return m_Reader.ReadUnicodeStringSafe(length);
}
public string ReadUnicodeString()
{
if ( m_Reader.ReadByte() != 2 )
return "";
public string ReadUnicodeString()
{
if (m_Reader.ReadByte() != 2)
return "";
int length = m_Reader.ReadUInt16();
int length = m_Reader.ReadUInt16();
return m_Reader.ReadUnicodeString( length );
}
}
return m_Reader.ReadUnicodeString(length);
}
}
}