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

Fixes several more expression issues and cast type check merges.

Browse source
This commit is contained in:
Kamron Batman 2018-09-15 23:31:51 -07:00
parent f93c3b992e
commit 9542c79ea4
24 changed files with 106 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Scripts/Mobiles/Special/BaseShieldGuard.cs
View file

@ -111,9 +111,8 @@ namespace Server.Mobiles
e.Handled = true;
Mobile from = e.Mobile;
Guild g = from.Guild as Guild;
if (g == null || g.Type != Type)
if (!(from.Guild is Guild g) || g.Type != Type)
{
Say(SignupNumber);
}
@ -124,7 +123,7 @@ namespace Server.Mobiles
Item twoHanded = from.FindItemOnLayer(Layer.TwoHanded);
if (pack?.FindItemByType(shield.GetType()) != null ||
twoHanded != null && shield.GetType().IsAssignableFrom(twoHanded.GetType()))
twoHanded != null && shield.GetType().IsInstanceOfType(twoHanded))
{
Say(1007110); // Why dost thou ask about virtue guards when thou art one?
shield.Delete();