Fixes body expression style.
This commit is contained in:
Kamron Batman
parent
3f0a72a62f
commit
33f5e77a24
957 changed files with 7424 additions and 15973 deletions
|
|
@ -77,8 +77,8 @@ namespace Server
|
|||
private NetState m_State;
|
||||
private ClientVersion m_Version;
|
||||
|
||||
public NetState State { get { return m_State; } }
|
||||
public ClientVersion Version { get { return m_Version; } }
|
||||
public NetState State => m_State;
|
||||
public ClientVersion Version => m_Version;
|
||||
|
||||
public ClientVersionReceivedArgs( NetState state, ClientVersion cv )
|
||||
{
|
||||
|
|
@ -90,10 +90,14 @@ namespace Server
|
|||
public class CreateGuildEventArgs : EventArgs
|
||||
{
|
||||
private int m_Id;
|
||||
public int Id { get { return m_Id; } set { m_Id = value; } }
|
||||
public int Id { get => m_Id;
|
||||
set => m_Id = value;
|
||||
}
|
||||
|
||||
private BaseGuild m_Guild;
|
||||
public BaseGuild Guild { get { return m_Guild; } set { m_Guild = value; } }
|
||||
public BaseGuild Guild { get => m_Guild;
|
||||
set => m_Guild = value;
|
||||
}
|
||||
|
||||
public CreateGuildEventArgs( int id )
|
||||
{
|
||||
|
|
@ -105,7 +109,7 @@ namespace Server
|
|||
{
|
||||
private Mobile m_Mobile;
|
||||
|
||||
public Mobile Mobile{ get{ return m_Mobile; } }
|
||||
public Mobile Mobile => m_Mobile;
|
||||
|
||||
public GuildGumpRequestArgs( Mobile mobile )
|
||||
{
|
||||
|
|
@ -117,7 +121,7 @@ namespace Server
|
|||
{
|
||||
private Mobile m_Mobile;
|
||||
|
||||
public Mobile Mobile { get { return m_Mobile; } }
|
||||
public Mobile Mobile => m_Mobile;
|
||||
|
||||
public QuestGumpRequestArgs( Mobile mobile )
|
||||
{
|
||||
|
|
@ -130,8 +134,8 @@ namespace Server
|
|||
private Mobile m_Mobile;
|
||||
private int m_Index;
|
||||
|
||||
public Mobile Mobile{ get{ return m_Mobile; } }
|
||||
public int Index{ get{ return m_Index; } }
|
||||
public Mobile Mobile => m_Mobile;
|
||||
public int Index => m_Index;
|
||||
|
||||
public SetAbilityEventArgs( Mobile mobile, int index )
|
||||
{
|
||||
|
|
@ -145,8 +149,8 @@ namespace Server
|
|||
private NetState m_State;
|
||||
private int m_Index;
|
||||
|
||||
public NetState State{ get{ return m_State; } }
|
||||
public int Index{ get{ return m_Index; } }
|
||||
public NetState State => m_State;
|
||||
public int Index => m_Index;
|
||||
|
||||
public DeleteRequestEventArgs( NetState state, int index )
|
||||
{
|
||||
|
|
@ -163,11 +167,15 @@ namespace Server
|
|||
private bool m_Accepted;
|
||||
private CityInfo[] m_CityInfo;
|
||||
|
||||
public NetState State{ get{ return m_State; } }
|
||||
public string Username{ get{ return m_Username; } }
|
||||
public string Password{ get{ return m_Password; } }
|
||||
public bool Accepted{ get{ return m_Accepted; } set{ m_Accepted = value; } }
|
||||
public CityInfo[] CityInfo{ get{ return m_CityInfo; } set{ m_CityInfo = value; } }
|
||||
public NetState State => m_State;
|
||||
public string Username => m_Username;
|
||||
public string Password => m_Password;
|
||||
public bool Accepted{ get => m_Accepted;
|
||||
set => m_Accepted = value;
|
||||
}
|
||||
public CityInfo[] CityInfo{ get => m_CityInfo;
|
||||
set => m_CityInfo = value;
|
||||
}
|
||||
|
||||
public GameLoginEventArgs( NetState state, string un, string pw )
|
||||
{
|
||||
|
|
@ -183,9 +191,9 @@ namespace Server
|
|||
private Mobile m_Aggressor;
|
||||
private bool m_Criminal;
|
||||
|
||||
public Mobile Aggressed{ get{ return m_Aggressed; } }
|
||||
public Mobile Aggressor{ get{ return m_Aggressor; } }
|
||||
public bool Criminal{ get{ return m_Criminal; } }
|
||||
public Mobile Aggressed => m_Aggressed;
|
||||
public Mobile Aggressor => m_Aggressor;
|
||||
public bool Criminal => m_Criminal;
|
||||
|
||||
private static Queue<AggressiveActionEventArgs> m_Pool = new Queue<AggressiveActionEventArgs>();
|
||||
|
||||
|
|
@ -227,8 +235,8 @@ namespace Server
|
|||
private Mobile m_Beholder;
|
||||
private Mobile m_Beheld;
|
||||
|
||||
public Mobile Beholder{ get{ return m_Beholder; } }
|
||||
public Mobile Beheld{ get{ return m_Beheld; } }
|
||||
public Mobile Beholder => m_Beholder;
|
||||
public Mobile Beheld => m_Beheld;
|
||||
|
||||
public ProfileRequestEventArgs( Mobile beholder, Mobile beheld )
|
||||
{
|
||||
|
|
@ -243,9 +251,9 @@ namespace Server
|
|||
private Mobile m_Beheld;
|
||||
private string m_Text;
|
||||
|
||||
public Mobile Beholder{ get{ return m_Beholder; } }
|
||||
public Mobile Beheld{ get{ return m_Beheld; } }
|
||||
public string Text{ get{ return m_Text; } }
|
||||
public Mobile Beholder => m_Beholder;
|
||||
public Mobile Beheld => m_Beheld;
|
||||
public string Text => m_Text;
|
||||
|
||||
public ChangeProfileRequestEventArgs( Mobile beholder, Mobile beheld, string text )
|
||||
{
|
||||
|
|
@ -260,8 +268,8 @@ namespace Server
|
|||
private Mobile m_Beholder;
|
||||
private Mobile m_Beheld;
|
||||
|
||||
public Mobile Beholder{ get{ return m_Beholder; } }
|
||||
public Mobile Beheld{ get{ return m_Beheld; } }
|
||||
public Mobile Beholder => m_Beholder;
|
||||
public Mobile Beheld => m_Beheld;
|
||||
|
||||
public PaperdollRequestEventArgs( Mobile beholder, Mobile beheld )
|
||||
{
|
||||
|
|
@ -279,11 +287,15 @@ namespace Server
|
|||
private bool m_Accepted;
|
||||
private ALRReason m_RejectReason;
|
||||
|
||||
public NetState State{ get{ return m_State; } }
|
||||
public string Username{ get{ return m_Username; } }
|
||||
public string Password{ get{ return m_Password; } }
|
||||
public bool Accepted{ get{ return m_Accepted; } set{ m_Accepted = value; } }
|
||||
public ALRReason RejectReason{ get{ return m_RejectReason; } set{ m_RejectReason = value; } }
|
||||
public NetState State => m_State;
|
||||
public string Username => m_Username;
|
||||
public string Password => m_Password;
|
||||
public bool Accepted{ get => m_Accepted;
|
||||
set => m_Accepted = value;
|
||||
}
|
||||
public ALRReason RejectReason{ get => m_RejectReason;
|
||||
set => m_RejectReason = value;
|
||||
}
|
||||
|
||||
public AccountLoginEventArgs( NetState state, string username, string password )
|
||||
{
|
||||
|
|
@ -299,9 +311,9 @@ namespace Server
|
|||
private Mobile m_Beheld;
|
||||
private int m_GumpID;
|
||||
|
||||
public Mobile Beholder{ get{ return m_Beholder; } }
|
||||
public Mobile Beheld{ get{ return m_Beheld; } }
|
||||
public int GumpID{ get{ return m_GumpID; } }
|
||||
public Mobile Beholder => m_Beholder;
|
||||
public Mobile Beheld => m_Beheld;
|
||||
public int GumpID => m_GumpID;
|
||||
|
||||
public VirtueItemRequestEventArgs( Mobile beholder, Mobile beheld, int gumpID )
|
||||
{
|
||||
|
|
@ -315,8 +327,8 @@ namespace Server
|
|||
{
|
||||
private Mobile m_Beholder, m_Beheld;
|
||||
|
||||
public Mobile Beholder{ get{ return m_Beholder; } }
|
||||
public Mobile Beheld{ get{ return m_Beheld; } }
|
||||
public Mobile Beholder => m_Beholder;
|
||||
public Mobile Beheld => m_Beheld;
|
||||
|
||||
public VirtueGumpRequestEventArgs( Mobile beholder, Mobile beheld )
|
||||
{
|
||||
|
|
@ -330,8 +342,8 @@ namespace Server
|
|||
private Mobile m_Mobile;
|
||||
private int m_VirtueID;
|
||||
|
||||
public Mobile Mobile{ get{ return m_Mobile; } }
|
||||
public int VirtueID{ get{ return m_VirtueID; } }
|
||||
public Mobile Mobile => m_Mobile;
|
||||
public int VirtueID => m_VirtueID;
|
||||
|
||||
public VirtueMacroRequestEventArgs( Mobile mobile, int virtueID )
|
||||
{
|
||||
|
|
@ -344,7 +356,7 @@ namespace Server
|
|||
{
|
||||
private Mobile m_Mobile;
|
||||
|
||||
public Mobile Mobile{ get{ return m_Mobile; } }
|
||||
public Mobile Mobile => m_Mobile;
|
||||
|
||||
public ChatRequestEventArgs( Mobile mobile )
|
||||
{
|
||||
|
|
@ -356,7 +368,7 @@ namespace Server
|
|||
{
|
||||
private Mobile m_Mobile;
|
||||
|
||||
public Mobile Mobile{ get{ return m_Mobile; } }
|
||||
public Mobile Mobile => m_Mobile;
|
||||
|
||||
public PlayerDeathEventArgs( Mobile mobile )
|
||||
{
|
||||
|
|
@ -369,9 +381,9 @@ namespace Server
|
|||
private Mobile m_From, m_Target;
|
||||
private string m_Name;
|
||||
|
||||
public Mobile From{ get{ return m_From; } }
|
||||
public Mobile Target{ get{ return m_Target; } }
|
||||
public string Name{ get{ return m_Name; } }
|
||||
public Mobile From => m_From;
|
||||
public Mobile Target => m_Target;
|
||||
public string Name => m_Name;
|
||||
|
||||
public RenameRequestEventArgs( Mobile from, Mobile target, string name )
|
||||
{
|
||||
|
|
@ -385,7 +397,7 @@ namespace Server
|
|||
{
|
||||
private Mobile m_Mobile;
|
||||
|
||||
public Mobile Mobile{ get{ return m_Mobile; } }
|
||||
public Mobile Mobile => m_Mobile;
|
||||
|
||||
public LogoutEventArgs( Mobile m )
|
||||
{
|
||||
|
|
@ -398,8 +410,10 @@ namespace Server
|
|||
private Socket m_Socket;
|
||||
private bool m_AllowConnection;
|
||||
|
||||
public Socket Socket{ get{ return m_Socket; } }
|
||||
public bool AllowConnection{ get { return m_AllowConnection; } set { m_AllowConnection = value; } }
|
||||
public Socket Socket => m_Socket;
|
||||
public bool AllowConnection{ get => m_AllowConnection;
|
||||
set => m_AllowConnection = value;
|
||||
}
|
||||
|
||||
public SocketConnectEventArgs( Socket s )
|
||||
{
|
||||
|
|
@ -412,7 +426,7 @@ namespace Server
|
|||
{
|
||||
private Mobile m_Mobile;
|
||||
|
||||
public Mobile Mobile{ get{ return m_Mobile; } }
|
||||
public Mobile Mobile => m_Mobile;
|
||||
|
||||
public ConnectedEventArgs( Mobile m )
|
||||
{
|
||||
|
|
@ -424,7 +438,7 @@ namespace Server
|
|||
{
|
||||
private Mobile m_Mobile;
|
||||
|
||||
public Mobile Mobile{ get{ return m_Mobile; } }
|
||||
public Mobile Mobile => m_Mobile;
|
||||
|
||||
public DisconnectedEventArgs( Mobile m )
|
||||
{
|
||||
|
|
@ -437,8 +451,8 @@ namespace Server
|
|||
private Mobile m_Mobile;
|
||||
private string m_Action;
|
||||
|
||||
public Mobile Mobile{ get{ return m_Mobile; } }
|
||||
public string Action{ get{ return m_Action; } }
|
||||
public Mobile Mobile => m_Mobile;
|
||||
public string Action => m_Action;
|
||||
|
||||
public AnimateRequestEventArgs( Mobile m, string action )
|
||||
{
|
||||
|
|
@ -453,9 +467,9 @@ namespace Server
|
|||
private Item m_Spellbook;
|
||||
private int m_SpellID;
|
||||
|
||||
public Mobile Mobile{ get{ return m_Mobile; } }
|
||||
public Item Spellbook{ get{ return m_Spellbook; } }
|
||||
public int SpellID{ get{ return m_SpellID; } }
|
||||
public Mobile Mobile => m_Mobile;
|
||||
public Item Spellbook => m_Spellbook;
|
||||
public int SpellID => m_SpellID;
|
||||
|
||||
public CastSpellRequestEventArgs( Mobile m, int spellID, Item book )
|
||||
{
|
||||
|
|
@ -471,9 +485,9 @@ namespace Server
|
|||
private Item m_Bandage;
|
||||
private Mobile m_Target;
|
||||
|
||||
public Mobile Mobile { get { return m_Mobile; } }
|
||||
public Item Bandage { get { return m_Bandage; } }
|
||||
public Mobile Target { get { return m_Target; } }
|
||||
public Mobile Mobile => m_Mobile;
|
||||
public Item Bandage => m_Bandage;
|
||||
public Mobile Target => m_Target;
|
||||
|
||||
public BandageTargetRequestEventArgs(Mobile m, Item bandage, Mobile target)
|
||||
{
|
||||
|
|
@ -488,8 +502,8 @@ namespace Server
|
|||
private Mobile m_Mobile;
|
||||
private int m_Type;
|
||||
|
||||
public Mobile Mobile{ get{ return m_Mobile; } }
|
||||
public int Type{ get{ return m_Type; } }
|
||||
public Mobile Mobile => m_Mobile;
|
||||
public int Type => m_Type;
|
||||
|
||||
public OpenSpellbookRequestEventArgs( Mobile m, int type )
|
||||
{
|
||||
|
|
@ -502,7 +516,7 @@ namespace Server
|
|||
{
|
||||
private Mobile m_Mobile;
|
||||
|
||||
public Mobile Mobile{ get{ return m_Mobile; } }
|
||||
public Mobile Mobile => m_Mobile;
|
||||
|
||||
public StunRequestEventArgs( Mobile m )
|
||||
{
|
||||
|
|
@ -514,7 +528,7 @@ namespace Server
|
|||
{
|
||||
private Mobile m_Mobile;
|
||||
|
||||
public Mobile Mobile{ get{ return m_Mobile; } }
|
||||
public Mobile Mobile => m_Mobile;
|
||||
|
||||
public DisarmRequestEventArgs( Mobile m )
|
||||
{
|
||||
|
|
@ -526,7 +540,7 @@ namespace Server
|
|||
{
|
||||
private Mobile m_Mobile;
|
||||
|
||||
public Mobile Mobile{ get{ return m_Mobile; } }
|
||||
public Mobile Mobile => m_Mobile;
|
||||
|
||||
public HelpRequestEventArgs( Mobile m )
|
||||
{
|
||||
|
|
@ -546,8 +560,10 @@ namespace Server
|
|||
private Exception m_Exception;
|
||||
private bool m_Close;
|
||||
|
||||
public Exception Exception{ get{ return m_Exception; } }
|
||||
public bool Close{ get{ return m_Close; } set{ m_Close = value; } }
|
||||
public Exception Exception => m_Exception;
|
||||
public bool Close{ get => m_Close;
|
||||
set => m_Close = value;
|
||||
}
|
||||
|
||||
public CrashedEventArgs( Exception e )
|
||||
{
|
||||
|
|
@ -560,8 +576,8 @@ namespace Server
|
|||
private Mobile m_Mobile;
|
||||
private int m_OldValue;
|
||||
|
||||
public Mobile Mobile{ get{ return m_Mobile; } }
|
||||
public int OldValue{ get{ return m_OldValue; } }
|
||||
public Mobile Mobile => m_Mobile;
|
||||
public int OldValue => m_OldValue;
|
||||
|
||||
public HungerChangedEventArgs( Mobile mobile, int oldValue )
|
||||
{
|
||||
|
|
@ -576,9 +592,11 @@ namespace Server
|
|||
private Direction m_Direction;
|
||||
private bool m_Blocked;
|
||||
|
||||
public Mobile Mobile{ get{ return m_Mobile; } }
|
||||
public Direction Direction{ get{ return m_Direction; } }
|
||||
public bool Blocked{ get{ return m_Blocked; } set{ m_Blocked = value; } }
|
||||
public Mobile Mobile => m_Mobile;
|
||||
public Direction Direction => m_Direction;
|
||||
public bool Blocked{ get => m_Blocked;
|
||||
set => m_Blocked = value;
|
||||
}
|
||||
|
||||
private static Queue<MovementEventArgs> m_Pool = new Queue<MovementEventArgs>();
|
||||
|
||||
|
|
@ -621,10 +639,12 @@ namespace Server
|
|||
private bool m_Rejected;
|
||||
private List<ServerInfo> m_Servers;
|
||||
|
||||
public NetState State{ get{ return m_State; } }
|
||||
public IAccount Account{ get{ return m_Account; } }
|
||||
public bool Rejected{ get{ return m_Rejected; } set{ m_Rejected = value; } }
|
||||
public List<ServerInfo> Servers{ get{ return m_Servers; } }
|
||||
public NetState State => m_State;
|
||||
public IAccount Account => m_Account;
|
||||
public bool Rejected{ get => m_Rejected;
|
||||
set => m_Rejected = value;
|
||||
}
|
||||
public List<ServerInfo> Servers => m_Servers;
|
||||
|
||||
public void AddServer( string name, IPEndPoint address )
|
||||
{
|
||||
|
|
@ -649,8 +669,8 @@ namespace Server
|
|||
private SkillName m_Name;
|
||||
private int m_Value;
|
||||
|
||||
public SkillName Name{ get{ return m_Name; } }
|
||||
public int Value{ get{ return m_Value; } }
|
||||
public SkillName Name => m_Name;
|
||||
public int Value => m_Value;
|
||||
|
||||
public SkillNameValue( SkillName name, int value )
|
||||
{
|
||||
|
|
@ -677,25 +697,29 @@ namespace Server
|
|||
|
||||
private Race m_Race;
|
||||
|
||||
public NetState State{ get{ return m_State; } }
|
||||
public IAccount Account{ get{ return m_Account; } }
|
||||
public Mobile Mobile{ get{ return m_Mobile; } set{ m_Mobile = value; } }
|
||||
public string Name{ get{ return m_Name; } }
|
||||
public bool Female{ get{ return m_Female; } }
|
||||
public int Hue{ get{ return m_Hue; } }
|
||||
public int Str{ get{ return m_Str; } }
|
||||
public int Dex{ get{ return m_Dex; } }
|
||||
public int Int{ get{ return m_Int; } }
|
||||
public CityInfo City{ get{ return m_City; } }
|
||||
public SkillNameValue[] Skills{ get{ return m_Skills; } }
|
||||
public int ShirtHue{ get{ return m_ShirtHue; } }
|
||||
public int PantsHue{ get{ return m_PantsHue; } }
|
||||
public int HairID{ get{ return m_HairID; } }
|
||||
public int HairHue{ get{ return m_HairHue; } }
|
||||
public int BeardID{ get{ return m_BeardID; } }
|
||||
public int BeardHue{ get{ return m_BeardHue; } }
|
||||
public int Profession{ get{ return m_Profession; } set{ m_Profession = value; }}
|
||||
public Race Race { get { return m_Race; } }
|
||||
public NetState State => m_State;
|
||||
public IAccount Account => m_Account;
|
||||
public Mobile Mobile{ get => m_Mobile;
|
||||
set => m_Mobile = value;
|
||||
}
|
||||
public string Name => m_Name;
|
||||
public bool Female => m_Female;
|
||||
public int Hue => m_Hue;
|
||||
public int Str => m_Str;
|
||||
public int Dex => m_Dex;
|
||||
public int Int => m_Int;
|
||||
public CityInfo City => m_City;
|
||||
public SkillNameValue[] Skills => m_Skills;
|
||||
public int ShirtHue => m_ShirtHue;
|
||||
public int PantsHue => m_PantsHue;
|
||||
public int HairID => m_HairID;
|
||||
public int HairHue => m_HairHue;
|
||||
public int BeardID => m_BeardID;
|
||||
public int BeardHue => m_BeardHue;
|
||||
public int Profession{ get => m_Profession;
|
||||
set => m_Profession = value;
|
||||
}
|
||||
public Race Race => m_Race;
|
||||
|
||||
public CharacterCreatedEventArgs( NetState state, IAccount a, string name, bool female, int hue, int str, int dex, int intel, CityInfo city, SkillNameValue[] skills, int shirtHue, int pantsHue, int hairID, int hairHue, int beardID, int beardHue, int profession, Race race )
|
||||
{
|
||||
|
|
@ -724,7 +748,7 @@ namespace Server
|
|||
{
|
||||
private Mobile m_Mobile;
|
||||
|
||||
public Mobile Mobile{ get{ return m_Mobile; } }
|
||||
public Mobile Mobile => m_Mobile;
|
||||
|
||||
public OpenDoorMacroEventArgs( Mobile mobile )
|
||||
{
|
||||
|
|
@ -742,13 +766,19 @@ namespace Server
|
|||
private bool m_Handled;
|
||||
private bool m_Blocked;
|
||||
|
||||
public Mobile Mobile{ get{ return m_Mobile; } }
|
||||
public string Speech{ get{ return m_Speech; } set{ m_Speech = value; } }
|
||||
public MessageType Type{ get{ return m_Type; } }
|
||||
public int Hue{ get{ return m_Hue; } }
|
||||
public int[] Keywords{ get{ return m_Keywords; } }
|
||||
public bool Handled{ get{ return m_Handled; } set{ m_Handled = value; } }
|
||||
public bool Blocked{ get{ return m_Blocked; } set{ m_Blocked = value; } }
|
||||
public Mobile Mobile => m_Mobile;
|
||||
public string Speech{ get => m_Speech;
|
||||
set => m_Speech = value;
|
||||
}
|
||||
public MessageType Type => m_Type;
|
||||
public int Hue => m_Hue;
|
||||
public int[] Keywords => m_Keywords;
|
||||
public bool Handled{ get => m_Handled;
|
||||
set => m_Handled = value;
|
||||
}
|
||||
public bool Blocked{ get => m_Blocked;
|
||||
set => m_Blocked = value;
|
||||
}
|
||||
|
||||
public bool HasKeyword( int keyword )
|
||||
{
|
||||
|
|
@ -773,7 +803,7 @@ namespace Server
|
|||
{
|
||||
private Mobile m_Mobile;
|
||||
|
||||
public Mobile Mobile{ get{ return m_Mobile; } }
|
||||
public Mobile Mobile => m_Mobile;
|
||||
|
||||
public LoginEventArgs( Mobile mobile )
|
||||
{
|
||||
|
|
@ -785,7 +815,7 @@ namespace Server
|
|||
{
|
||||
private bool m_Msg;
|
||||
|
||||
public bool Message{ get{ return m_Msg; } }
|
||||
public bool Message => m_Msg;
|
||||
|
||||
public WorldSaveEventArgs( bool msg )
|
||||
{
|
||||
|
|
@ -804,8 +834,10 @@ namespace Server
|
|||
m_Blocked = false;
|
||||
}
|
||||
|
||||
public NetState NetState{ get{ return m_State; } }
|
||||
public bool Blocked{ get{ return m_Blocked; } set{ m_Blocked = value; } }
|
||||
public NetState NetState => m_State;
|
||||
public bool Blocked{ get => m_Blocked;
|
||||
set => m_Blocked = value;
|
||||
}
|
||||
}
|
||||
|
||||
public static class EventSink
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue