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

Fixes sequential checks

Browse source
This commit is contained in:
Kamron Batman 2018-09-14 13:00:41 -07:00
parent 83dcf536d8
commit 42d0b6271f
67 changed files with 99 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Scripts/Spells/Base/Spell.cs
View file

@ -145,7 +145,7 @@ namespace Server.Spells
TransformContext context = TransformationSpellHelper.GetContext( Caster );
if ( context != null && context.Spell is ReaperFormSpell )
if ( context?.Spell is ReaperFormSpell )
damageBonus += ((ReaperFormSpell)context.Spell).SpellDamageBonus;
damage = AOS.Scale( damage, 100 + damageBonus );
@ -173,7 +173,7 @@ namespace Server.Spells
object o = ProtectionSpell.Registry[m_Caster];
bool disturb = true;
if ( o != null && o is double )
if ( o is double )
{
if ( ((double)o) > Utility.RandomDouble()*100.0 )
disturb = false;
@ -513,7 +513,7 @@ namespace Server.Spells
m_Caster.SendLocalizedMessage( 1072060 ); // You cannot cast a spell while calmed.
}
#region Dueling
else if ( m_Caster is PlayerMobile && ((PlayerMobile)m_Caster).DuelContext != null && !((PlayerMobile)m_Caster).DuelContext.AllowSpellCast( m_Caster, this ) )
else if ( (m_Caster as PlayerMobile)?.DuelContext != null && !((PlayerMobile)m_Caster).DuelContext.AllowSpellCast( m_Caster, this ) )
{
}
#endregion
@ -899,7 +899,7 @@ namespace Server.Spells
protected override void OnTick()
{
if ( m_Spell == null || m_Spell.m_Caster == null )
if ( m_Spell?.m_Caster == null )
{
return;
}

4
Scripts/Spells/Base/SpellHelper.cs
View file

@ -747,7 +747,7 @@ namespace Server.Spells
{
PlayerMobile pm = m_TravelCaster as PlayerMobile;
if ( pm != null && pm.DuelPlayer != null && !pm.DuelPlayer.Eliminated )
if ( pm?.DuelPlayer != null && !pm.DuelPlayer.Eliminated )
return true;
}
@ -880,7 +880,7 @@ namespace Server.Spells
{
PlayerMobile pm = (PlayerMobile) caster;
if ( pm == null || pm.DuelContext == null || !pm.DuelContext.Started || pm.DuelPlayer == null || pm.DuelPlayer.Eliminated )
if ( pm?.DuelContext == null || !pm.DuelContext.Started || pm.DuelPlayer == null || pm.DuelPlayer.Eliminated )
return true;
}
#endregion