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

fix: Fixes first/second scrolls crashing (#891)

Browse source 
* Fixes first/second circle scrolls crashing
* Consolidates some resistance logic
* Removes unnecessary multiple lookups for items on layer
This commit is contained in:
Kamron Batman 2021-12-24 15:26:12 -08:00 • committed by GitHub
parent f634ee2748
commit 171df32257
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 39 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Projects/UOContent/Spells/Chivalry/ConsecrateWeapon.cs
View file

@ -29,7 +29,7 @@ namespace Server.Spells.Chivalry
public override void OnCast()
{
if (!(Caster.Weapon is BaseWeapon weapon) || weapon is Fists)
if (Caster.Weapon is not (BaseWeapon weapon and not Fists))
{
Caster.SendLocalizedMessage(501078); // You must be holding a weapon.
}

2
Projects/UOContent/Spells/Chivalry/NobleSacrifice.cs
View file

@ -40,7 +40,7 @@ namespace Server.Spells.Chivalry
continue;
}
if (Caster != m && m.InLOS(Caster) && Caster.CanBeBeneficial(m, false, true) && !(m is Golem))
if (Caster != m && m.InLOS(Caster) && Caster.CanBeBeneficial(m, false, true) && m is not Golem)
{
targets.Add(m);
}