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

Changes properties to use automatic property initializers

Browse source
This commit is contained in:
Kamron Batman 2018-09-14 15:23:29 -07:00
parent f0a48ad431
commit 06fa31a7bf
623 changed files with 13072 additions and 19304 deletions
Download patch file Download diff file Expand all files Collapse all files

49
Scripts/Items/Addons/AddonContainerComponent.cs
View file

@ -8,22 +8,11 @@ namespace Server.Items
public virtual bool NeedsWall => false;
public virtual Point3D WallPosition => Point3D.Zero;
private Point3D m_Offset;
private BaseAddonContainer m_Addon;
[CommandProperty( AccessLevel.GameMaster )]
public BaseAddonContainer Addon { get; set; }
[CommandProperty( AccessLevel.GameMaster )]
public BaseAddonContainer Addon
{
get => m_Addon;
set => m_Addon = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Point3D Offset
{
get => m_Offset;
set => m_Offset = value;
}
public Point3D Offset { get; set; }
[Hue, CommandProperty( AccessLevel.GameMaster )]
public override int Hue
@ -33,8 +22,8 @@ namespace Server.Items
{
base.Hue = value;
if ( m_Addon != null && m_Addon.ShareHue )
m_Addon.Hue = value;
if ( Addon != null && Addon.ShareHue )
Addon.Hue = value;
}
}
@ -60,31 +49,31 @@ namespace Server.Items
public override void OnDoubleClick( Mobile from )
{
m_Addon?.OnComponentUsed( this, from );
Addon?.OnComponentUsed( this, from );
}
public override void OnLocationChange( Point3D old )
{
if ( m_Addon != null )
m_Addon.Location = new Point3D( X - m_Offset.X, Y - m_Offset.Y, Z - m_Offset.Z );
if ( Addon != null )
Addon.Location = new Point3D( X - Offset.X, Y - Offset.Y, Z - Offset.Z );
}
public override void GetContextMenuEntries( Mobile from, List<ContextMenuEntry> list )
{
m_Addon?.GetContextMenuEntries( from, list );
Addon?.GetContextMenuEntries( from, list );
}
public override void OnMapChange()
{
if ( m_Addon != null )
m_Addon.Map = Map;
if ( Addon != null )
Addon.Map = Map;
}
public override void OnAfterDelete()
{
base.OnAfterDelete();
m_Addon?.Delete();
Addon?.Delete();
}
public override void Serialize( GenericWriter writer )
@ -93,8 +82,8 @@ namespace Server.Items
writer.Write( (int) 0 ); // version
writer.Write( m_Addon );
writer.Write( m_Offset );
writer.Write( Addon );
writer.Write( Offset );
}
public override void Deserialize( GenericReader reader )
@ -103,18 +92,18 @@ namespace Server.Items
int version = reader.ReadInt();
m_Addon = reader.ReadItem() as BaseAddonContainer;
m_Offset = reader.ReadPoint3D();
Addon = reader.ReadItem() as BaseAddonContainer;
Offset = reader.ReadPoint3D();
m_Addon?.OnComponentLoaded( this );
Addon?.OnComponentLoaded( this );
AddonComponent.ApplyLightTo( this );
}
public virtual void OnChop( Mobile from )
{
if ( m_Addon != null && from.InRange( GetWorldLocation(), 3 ) )
m_Addon.OnChop( from );
if ( Addon != null && from.InRange( GetWorldLocation(), 3 ) )
Addon.OnChop( from );
else
from.SendLocalizedMessage( 500446 ); // That is too far away.
}