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

Fixes implicit ternary expressions

Browse source
This commit is contained in:
Kamron Batman 2018-09-14 14:56:48 -07:00
parent c85b0a740c
commit ff26dfa375
345 changed files with 1905 additions and 2336 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Scripts/Items/Skill Items/Magical/Misc/Moongate.cs
View file

@ -98,7 +98,7 @@ namespace Server.Items
public virtual void UseGate( Mobile m )
{
ClientFlags flags = m.NetState == null ? ClientFlags.None : m.NetState.Flags;
ClientFlags flags = m.NetState?.Flags ?? ClientFlags.None;
if ( Factions.Sigil.ExistsOn( m ) )
{

4
Scripts/Items/Skill Items/Magical/Misc/PotionKeg.cs
View file

@ -191,10 +191,6 @@ namespace Server.Items
pot.Delete();
}
}
else
{
// TODO: Target a bottle
}
}
else
{

2
Scripts/Items/Skill Items/Magical/Potions/Conflagration Potions/BaseConflagrationPotion.cs
View file

@ -315,7 +315,7 @@ namespace Server.Items
if ( (m.Z + 16) > m_Item.Z && (m_Item.Z + 12) > m.Z && (!Core.AOS || m != from) && SpellHelper.ValidIndirectTarget( from, m ) && from.CanBeHarmful( m, false ) )
{
@from?.DoHarmful( m );
from?.DoHarmful( m );
AOS.Damage( m, from, m_Item.GetDamage(), 0, 100, 0, 0, 0 );
m.PlaySound( 0x208 );

17
Scripts/Items/Skill Items/Magical/Spellbook.cs
View file

@ -104,7 +104,7 @@ namespace Server.Items
Spellbook book = Find( from, -1, type );
book?.DisplayTo( @from );
book?.DisplayTo( from );
}
private static void EventSink_CastSpellRequest( CastSpellRequestEventArgs e )
@ -150,17 +150,17 @@ namespace Server.Items
{
if ( spellID >= 0 && spellID < 64 )
return SpellbookType.Regular;
else if ( spellID >= 100 && spellID < 117 )
if ( spellID >= 100 && spellID < 117 )
return SpellbookType.Necromancer;
else if ( spellID >= 200 && spellID < 210 )
if ( spellID >= 200 && spellID < 210 )
return SpellbookType.Paladin;
else if ( spellID >= 400 && spellID < 406 )
if ( spellID >= 400 && spellID < 406 )
return SpellbookType.Samurai;
else if ( spellID >= 500 && spellID < 508 )
if ( spellID >= 500 && spellID < 508 )
return SpellbookType.Ninja;
else if ( spellID >= 600 && spellID < 617 )
if ( spellID >= 600 && spellID < 617 )
return SpellbookType.Arcanist;
else if ( spellID >= 677 && spellID < 693 )
if ( spellID >= 677 && spellID < 693 )
return SpellbookType.Mystic;
return SpellbookType.Invalid;
@ -333,7 +333,8 @@ namespace Server.Items
{
return false;
}
else if ( !from.CanBeginAction( typeof( BaseWeapon ) ) )
if ( !from.CanBeginAction( typeof( BaseWeapon ) ) )
{
return false;
}