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

Add DefaultName property to Mobiles & Items (#18)

Browse source
This commit is contained in:
Kamron Batman 2018-08-09 17:18:41 -07:00 • committed by GitHub
parent b06f5bf60d
commit 8ee42c8ea2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
713 changed files with 5112 additions and 4987 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Server/Items/VirtualCheck.cs
View file

@ -19,10 +19,10 @@ namespace Server
{
public static bool UseEditGump = false;
public override bool IsVirtualItem { get { return true; } }
public override bool IsVirtualItem => true;
public override bool DisplayWeight { get { return false; } }
public override bool DisplayLootType { get { return false; } }
public override bool DisplayWeight => false;
public override bool DisplayLootType => false;
public override double DefaultWeight { get { return 0; } }

6
Server/Mobile.cs
View file

@ -8386,18 +8386,18 @@ namespace Server
}
[CommandProperty( AccessLevel.GameMaster )]
public string Name
public virtual string Name
{
get
{
if( m_NameMod != null )
if ( m_NameMod != null )
return m_NameMod;
return m_Name;
}
set
{
if( m_Name != value ) // I'm leaving out the && m_NameMod == null
if ( m_Name != value ) // I'm leaving out the && m_NameMod == null
{
string oldName = m_Name;
m_Name = value;

10
Server/Timer.cs
View file

@ -343,7 +343,7 @@ namespace Server
m_Queue.Enqueue( t );
loaded = true;
if ( t.m_Count != 0 && (++t.m_Index >= t.m_Count) )
{
t.Stop();
@ -569,7 +569,7 @@ namespace Server
public TimerCallback Callback{ get{ return m_Callback; } }
public override bool DefRegCreation{ get{ return false; } }
public override bool DefRegCreation => false;
public DelayCallTimer( TimeSpan delay, TimeSpan interval, int count, TimerCallback callback ) : base( delay, interval, count )
{
@ -596,7 +596,7 @@ namespace Server
public TimerStateCallback Callback{ get{ return m_Callback; } }
public override bool DefRegCreation{ get{ return false; } }
public override bool DefRegCreation => false;
public DelayStateCallTimer( TimeSpan delay, TimeSpan interval, int count, TimerStateCallback callback, object state ) : base( delay, interval, count )
{
@ -625,7 +625,7 @@ namespace Server
public TimerStateCallback<T> Callback { get { return m_Callback; } }
public override bool DefRegCreation { get { return false; } }
public override bool DefRegCreation => false;
public DelayStateCallTimer( TimeSpan delay, TimeSpan interval, int count, TimerStateCallback<T> callback, T state )
: base( delay, interval, count )
@ -683,4 +683,4 @@ namespace Server
{
}
}
}
}