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

More cast conversion fixes

Browse source
This commit is contained in:
Kamron Batman 2018-09-06 18:07:42 -07:00
parent 3f45bd57b9
commit aba9452161
46 changed files with 359 additions and 506 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Scripts/Items/Skill Items/Magical/Potions/BasePotion.cs
View file

@ -81,13 +81,9 @@ namespace Server.Items
if ( handTwo is BaseWeapon )
handOne = handTwo;
if ( handTwo is BaseRanged )
{
BaseRanged ranged = (BaseRanged) handTwo;
if ( ranged.Balanced )
return true;
}
if ( handTwo is BaseRanged ranged && ranged.Balanced )
return true;
return ( handOne == null || handTwo == null );
}
@ -223,10 +219,8 @@ namespace Server.Items
public override bool StackWith( Mobile from, Item dropped, bool playSound )
{
if ( dropped is BasePotion && ((BasePotion)dropped).m_PotionEffect == m_PotionEffect )
return base.StackWith( from, dropped, playSound );
return false;
return dropped is BasePotion potion && potion.m_PotionEffect == m_PotionEffect &&
base.StackWith(from, potion, playSound);
}
#region ICraftable Members