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/Addons/AddonComponent.cs
View file

@ -151,7 +151,7 @@ namespace Server.Items
public override void OnDoubleClick( Mobile from )
{
m_Addon?.OnComponentUsed( this, @from );
m_Addon?.OnComponentUsed( this, from );
}
public void OnChop( Mobile from )

4
Scripts/Items/Addons/AddonContainerComponent.cs
View file

@ -60,7 +60,7 @@ namespace Server.Items
public override void OnDoubleClick( Mobile from )
{
m_Addon?.OnComponentUsed( this, @from );
m_Addon?.OnComponentUsed( this, from );
}
public override void OnLocationChange( Point3D old )
@ -71,7 +71,7 @@ namespace Server.Items
public override void GetContextMenuEntries( Mobile from, List<ContextMenuEntry> list )
{
m_Addon?.GetContextMenuEntries( @from, list );
m_Addon?.GetContextMenuEntries( from, list );
}
public override void OnMapChange()

5
Scripts/Items/Addons/ArcheryButteAddon.cs
View file

@ -165,7 +165,8 @@ namespace Server.Items
from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 500598 ); // You are too far away from the archery butte to get an accurate shot.
return;
}
else if ( from.InRange( worldLoc, 4 ) )
if ( from.InRange( worldLoc, 4 ) )
{
from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 500599 ); // You are too close to the target.
return;
@ -250,7 +251,7 @@ namespace Server.Items
if ( split )
{
PublicOverheadMessage( MessageType.Regular, 0x3B2, 1010027 + area,
$"{@from.Name}\t{(isArrow ? "arrow" : "bolt")}");
$"{from.Name}\t{(isArrow ? "arrow" : "bolt")}");
}
else
{

4
Scripts/Items/Addons/BaseAddonContainer.cs
View file

@ -168,7 +168,7 @@ namespace Server.Items
if ( !map.CanFit( p3D.X, p3D.Y, p3D.Z, c.ItemData.Height, false, true, ( c.Z == 0 ) ) )
return AddonFitResult.Blocked;
else if ( !BaseAddon.CheckHouse( from, p3D, map, c.ItemData.Height, ref house ) )
if ( !BaseAddon.CheckHouse( from, p3D, map, c.ItemData.Height, ref house ) )
return AddonFitResult.NotInHouse;
if ( c.NeedsWall )
@ -184,7 +184,7 @@ namespace Server.Items
if ( !map.CanFit( p3.X, p3.Y, p3.Z, ItemData.Height, false, true, ( Z == 0 ) ) )
return AddonFitResult.Blocked;
else if ( !BaseAddon.CheckHouse( from, p3, map, ItemData.Height, ref house ) )
if ( !BaseAddon.CheckHouse( from, p3, map, ItemData.Height, ref house ) )
return AddonFitResult.NotInHouse;
if ( NeedsWall )

2
Scripts/Items/Addons/ElvenSpinningwheelEastAddon.cs
View file

@ -77,7 +77,7 @@ namespace Server.Items
}
}
callback?.Invoke( this, @from, hue );
callback?.Invoke( this, from, hue );
}
private class SpinTimer : Timer

2
Scripts/Items/Addons/ElvenSpinningwheelSouthAddon.cs
View file

@ -79,7 +79,7 @@ namespace Server.Items
}
}
callback?.Invoke( this, @from, hue );
callback?.Invoke( this, from, hue );
}
private class SpinTimer : Timer

2
Scripts/Items/Addons/SolenAntHole.cs
View file

@ -22,7 +22,7 @@ namespace Server.Items
{
from.MoveToWorld( new Point3D( 5922, 2024, 0 ), map );
PublicOverheadMessage( MessageType.Regular, 0x3B2, true,
$"* {@from.Name} dives into the hole and disappears!*");
$"* {from.Name} dives into the hole and disappears!*");
}
}
else

2
Scripts/Items/Addons/SpinningwheelEastAddon.cs
View file

@ -87,7 +87,7 @@ namespace Server.Items
}
}
callback?.Invoke( this, @from, hue );
callback?.Invoke( this, from, hue );
}
private class SpinTimer : Timer

2
Scripts/Items/Addons/SpinningwheelSouthAddon.cs
View file

@ -79,7 +79,7 @@ namespace Server.Items
}
}
callback?.Invoke( this, @from, hue );
callback?.Invoke( this, from, hue );
}
private class SpinTimer : Timer