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/Third/MagicLock.cs
View file

@ -24,7 +24,7 @@ namespace Server.Spells.Third
public void Target(Item item)
{
if (!(item is LockableContainer cont))
if (item is not LockableContainer cont)
{
Caster.SendLocalizedMessage(501762); // Target must be an unlocked chest.
}

4
Projects/UOContent/Spells/Third/Teleport.cs
View file

@ -98,8 +98,8 @@ namespace Server.Spells.Third
foreach (var item in eable)
{
if (item is ParalyzeFieldSpell.InternalItem || item is PoisonFieldSpell.InternalItem ||
item is FireFieldSpell.FireFieldItem)
if (item is ParalyzeFieldSpell.InternalItem or
PoisonFieldSpell.InternalItem or FireFieldSpell.FireFieldItem)
{
item.OnMoveOver(m);
}

2
Projects/UOContent/Spells/Third/Unlock.cs
View file

@ -42,7 +42,7 @@ namespace Server.Spells.Third
{
Caster.LocalOverheadMessage(MessageType.Regular, 0x3B2, 503101); // That did not need to be unlocked.
}
else if (!(p is LockableContainer cont))
else if (p is not LockableContainer cont)
{
Caster.SendLocalizedMessage(501666); // You can't unlock that!
}

2
Projects/UOContent/Spells/Third/WallOfStone.cs
View file

@ -149,7 +149,7 @@ namespace Server.Spells.Third
if (m is PlayerMobile)
{
var noto = Notoriety.Compute(m_Caster, m);
if (noto == Notoriety.Enemy || noto == Notoriety.Ally)
if (noto is Notoriety.Enemy or Notoriety.Ally)
{
return false;
}