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

Sets a default parameter for OnHit. More casting cleanup.

Browse source
This commit is contained in:
Kamron Batman 2018-09-09 08:54:10 -07:00
parent 74f498c1c8
commit d6c0bf2d4c
96 changed files with 350 additions and 579 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Scripts/Items/Special/Mutation Core/PlagueBeastBackpack.cs
View file

@ -130,9 +130,7 @@ namespace Server.Items
for ( int i = Items.Count - 1; i >= 0; i-- )
{
PlagueBeastComponent innard = Items[ i ] as PlagueBeastComponent;
if ( innard != null )
if ( Items[ i ] is PlagueBeastComponent innard )
{
Rectangle2D r = ItemBounds.Table[ innard.ItemID ];

6
Scripts/Items/Special/Mutation Core/PlagueBeastBlood.cs
View file

@ -62,9 +62,7 @@ namespace Server.Items
{
for ( int i = 0; i < pack.Items.Count; i++ )
{
PlagueBeastMainOrgan main = pack.Items[ i ] as PlagueBeastMainOrgan;
if ( main != null && main.Complete )
if ( pack.Items[ i ] is PlagueBeastMainOrgan main && main.Complete )
main.FinishOpening( from );
}
}
@ -104,7 +102,7 @@ namespace Server.Items
ItemID--;
}
}
}
public PlagueBeastBlood( Serial serial ) : base( serial )
{

4
Scripts/Items/Special/Mutation Core/PlagueBeastInnard.cs
View file

@ -136,8 +136,8 @@ namespace Server.Items
{
if ( m_Organ != null && m_Organ.OnDropped( from, dropped, this ) )
{
if ( dropped is PlagueBeastComponent )
m_Organ.Components.Add( (PlagueBeastComponent) dropped );
if ( dropped is PlagueBeastComponent component )
m_Organ.Components.Add( component );
}
return true;

4
Scripts/Items/Special/Mutation Core/PlagueBeastOrgans.cs
View file

@ -55,9 +55,7 @@ namespace Server.Items
public void AddComponent( PlagueBeastComponent c, int x, int y )
{
Container pack = Parent as Container;
if ( pack != null )
if ( Parent is Container pack )
pack.DropItem( c );
c.Organ = this;

4
Scripts/Items/Special/Mutation Core/PlagueBeastVein.cs
View file

@ -56,9 +56,7 @@ namespace Server.Items
if ( Owner != null )
Owner.PlaySound( 0x199 );
PlagueBeastRubbleOrgan organ = Organ as PlagueBeastRubbleOrgan;
if ( organ != null )
if ( Organ is PlagueBeastRubbleOrgan organ )
organ.OnVeinCut( from, this );
}