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

Fixes code according to modern code style. Fixes a few expression bugs.

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

220
Server/Items/BaseMulti.cs
View file

@ -22,140 +22,144 @@ using System;
namespace Server.Items
{
public class BaseMulti : Item
{
[Constructible]
public BaseMulti( int itemID ) : base( itemID )
{
Movable = false;
}
public class BaseMulti : Item
{
[Constructible]
public BaseMulti(int itemID) : base(itemID)
{
Movable = false;
}
public BaseMulti( Serial serial ) : base( serial )
{
}
public BaseMulti(Serial serial) : base(serial)
{
}
[CommandProperty( AccessLevel.GameMaster )]
public override int ItemID {
get => base.ItemID;
set {
if ( base.ItemID != value ) {
Map facet = ( Parent == null ? Map : null );
[CommandProperty(AccessLevel.GameMaster)]
public override int ItemID
{
get => base.ItemID;
set
{
if (base.ItemID != value)
{
Map facet = Parent == null ? Map : null;
facet?.OnLeave( this );
facet?.OnLeave(this);
base.ItemID = value;
base.ItemID = value;
facet?.OnEnter( this );
}
}
}
facet?.OnEnter(this);
}
}
}
[Obsolete( "Replace with calls to OnLeave and OnEnter surrounding component invalidation.", true )]
public virtual void RefreshComponents()
{
if ( Parent == null ) {
Map facet = Map;
public override int LabelNumber
{
get
{
MultiComponentList mcl = Components;
if ( facet != null ) {
facet.OnLeave( this );
facet.OnEnter( this );
}
}
}
if (mcl.List.Length > 0)
{
int id = mcl.List[0].m_ItemID;
public override int LabelNumber
{
get
{
MultiComponentList mcl = Components;
if (id < 0x4000)
return 1020000 + id;
return 1078872 + id;
}
if ( mcl.List.Length > 0 ) {
int id = mcl.List[0].m_ItemID;
return base.LabelNumber;
}
}
if ( id < 0x4000 )
return 1020000 + id;
return 1078872 + id;
}
public virtual bool AllowsRelativeDrop => false;
return base.LabelNumber;
}
}
public virtual MultiComponentList Components => MultiData.GetComponents(ItemID);
public virtual bool AllowsRelativeDrop => false;
[Obsolete("Replace with calls to OnLeave and OnEnter surrounding component invalidation.", true)]
public virtual void RefreshComponents()
{
if (Parent == null)
{
Map facet = Map;
public override int GetMaxUpdateRange()
{
return 22;
}
if (facet != null)
{
facet.OnLeave(this);
facet.OnEnter(this);
}
}
}
public override int GetUpdateRange( Mobile m )
{
return 22;
}
public override int GetMaxUpdateRange()
{
return 22;
}
public virtual MultiComponentList Components => MultiData.GetComponents( ItemID );
public override int GetUpdateRange(Mobile m)
{
return 22;
}
public virtual bool Contains( Point2D p )
{
return Contains( p.m_X, p.m_Y );
}
public virtual bool Contains(Point2D p)
{
return Contains(p.m_X, p.m_Y);
}
public virtual bool Contains( Point3D p )
{
return Contains( p.m_X, p.m_Y );
}
public virtual bool Contains(Point3D p)
{
return Contains(p.m_X, p.m_Y);
}
public virtual bool Contains( IPoint3D p )
{
return Contains( p.X, p.Y );
}
public virtual bool Contains(IPoint3D p)
{
return Contains(p.X, p.Y);
}
public virtual bool Contains( int x, int y )
{
MultiComponentList mcl = Components;
public virtual bool Contains(int x, int y)
{
MultiComponentList mcl = Components;
x -= X + mcl.Min.m_X;
y -= Y + mcl.Min.m_Y;
x -= X + mcl.Min.m_X;
y -= Y + mcl.Min.m_Y;
return x >= 0
&& x < mcl.Width
&& y >= 0
&& y < mcl.Height
&& mcl.Tiles[x][y].Length > 0;
}
return x >= 0
&& x < mcl.Width
&& y >= 0
&& y < mcl.Height
&& mcl.Tiles[x][y].Length > 0;
}
public bool Contains( Mobile m )
{
if ( m.Map == Map )
return Contains( m.X, m.Y );
return false;
}
public bool Contains(Mobile m)
{
if (m.Map == Map)
return Contains(m.X, m.Y);
return false;
}
public bool Contains( Item item )
{
if ( item.Map == Map )
return Contains( item.X, item.Y );
return false;
}
public bool Contains(Item item)
{
if (item.Map == Map)
return Contains(item.X, item.Y);
return false;
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write( (int) 1 ); // version
}
writer.Write(1); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
int version = reader.ReadInt();
if ( version == 0 ) {
if ( ItemID >= 0x4000 ) {
ItemID -= 0x4000;
}
}
}
}
if (version == 0)
if (ItemID >= 0x4000)
ItemID -= 0x4000;
}
}
}