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

Fixes body expression style.

Browse source
This commit is contained in:
Kamron Batman 2018-09-14 08:46:14 -07:00
parent 3f0a72a62f
commit 33f5e77a24
957 changed files with 7424 additions and 15973 deletions
Download patch file Download diff file Expand all files Collapse all files

56
Server/Targeting/LandTarget.cs
View file

@ -37,66 +37,24 @@ namespace Server.Targeting
}
[CommandProperty( AccessLevel.Counselor )]
public string Name
{
get
{
return TileData.LandTable[m_TileID].Name;
}
}
public string Name => TileData.LandTable[m_TileID].Name;
[CommandProperty( AccessLevel.Counselor )]
public TileFlag Flags
{
get
{
return TileData.LandTable[m_TileID].Flags;
}
}
public TileFlag Flags => TileData.LandTable[m_TileID].Flags;
[CommandProperty( AccessLevel.Counselor )]
public int TileID
{
get
{
return m_TileID;
}
}
public int TileID => m_TileID;
[CommandProperty( AccessLevel.Counselor )]
public Point3D Location
{
get
{
return m_Location;
}
}
public Point3D Location => m_Location;
[CommandProperty( AccessLevel.Counselor )]
public int X
{
get
{
return m_Location.X;
}
}
public int X => m_Location.X;
[CommandProperty( AccessLevel.Counselor )]
public int Y
{
get
{
return m_Location.Y;
}
}
public int Y => m_Location.Y;
[CommandProperty( AccessLevel.Counselor )]
public int Z
{
get
{
return m_Location.Z;
}
}
public int Z => m_Location.Z;
}
}

20
Server/Targeting/MultiTarget.cs
View file

@ -29,26 +29,14 @@ namespace Server.Targeting
public int MultiID
{
get
{
return m_MultiID;
}
set
{
m_MultiID = value;
}
get => m_MultiID;
set => m_MultiID = value;
}
public Point3D Offset
{
get
{
return m_Offset;
}
set
{
m_Offset = value;
}
get => m_Offset;
set => m_Offset = value;
}
protected MultiTarget( int multiID, Point3D offset )

56
Server/Targeting/StaticTarget.cs
View file

@ -33,66 +33,24 @@ namespace Server.Targeting
}
[CommandProperty( AccessLevel.Counselor )]
public Point3D Location
{
get
{
return m_Location;
}
}
public Point3D Location => m_Location;
[CommandProperty( AccessLevel.Counselor )]
public string Name
{
get
{
return TileData.ItemTable[m_ItemID].Name;
}
}
public string Name => TileData.ItemTable[m_ItemID].Name;
[CommandProperty( AccessLevel.Counselor )]
public TileFlag Flags
{
get
{
return TileData.ItemTable[m_ItemID].Flags;
}
}
public TileFlag Flags => TileData.ItemTable[m_ItemID].Flags;
[CommandProperty( AccessLevel.Counselor )]
public int X
{
get
{
return m_Location.X;
}
}
public int X => m_Location.X;
[CommandProperty( AccessLevel.Counselor )]
public int Y
{
get
{
return m_Location.Y;
}
}
public int Y => m_Location.Y;
[CommandProperty( AccessLevel.Counselor )]
public int Z
{
get
{
return m_Location.Z;
}
}
public int Z => m_Location.Z;
[CommandProperty( AccessLevel.Counselor )]
public int ItemID
{
get
{
return m_ItemID;
}
}
public int ItemID => m_ItemID;
}
}

74
Server/Targeting/Target.cs
View file

@ -31,8 +31,8 @@ namespace Server.Targeting
public static bool TargetIDValidation
{
get { return m_TargetIDValidation; }
set { m_TargetIDValidation = value; }
get => m_TargetIDValidation;
set => m_TargetIDValidation = value;
}
private int m_TargetID;
@ -44,7 +44,7 @@ namespace Server.Targeting
private TargetFlags m_Flags;
private DateTime m_TimeoutTime;
public DateTime TimeoutTime{ get{ return m_TimeoutTime; } }
public DateTime TimeoutTime => m_TimeoutTime;
protected Target( int range, bool allowGround, TargetFlags flags )
{
@ -134,47 +134,23 @@ namespace Server.Targeting
public bool CheckLOS
{
get
{
return m_CheckLOS;
}
set
{
m_CheckLOS = value;
}
get => m_CheckLOS;
set => m_CheckLOS = value;
}
public bool DisallowMultis
{
get
{
return m_DisallowMultis;
}
set
{
m_DisallowMultis = value;
}
get => m_DisallowMultis;
set => m_DisallowMultis = value;
}
public bool AllowNonlocal
{
get
{
return m_AllowNonlocal;
}
set
{
m_AllowNonlocal = value;
}
get => m_AllowNonlocal;
set => m_AllowNonlocal = value;
}
public int TargetID
{
get
{
return m_TargetID;
}
}
public int TargetID => m_TargetID;
public virtual Packet GetPacketFor( NetState ns )
{
@ -350,38 +326,20 @@ namespace Server.Targeting
public int Range
{
get
{
return m_Range;
}
set
{
m_Range = value;
}
get => m_Range;
set => m_Range = value;
}
public bool AllowGround
{
get
{
return m_AllowGround;
}
set
{
m_AllowGround = value;
}
get => m_AllowGround;
set => m_AllowGround = value;
}
public TargetFlags Flags
{
get
{
return m_Flags;
}
set
{
m_Flags = value;
}
get => m_Flags;
set => m_Flags = value;
}
}
}