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

Sets a default parameter for OnHit. More casting cleanup.

Browse source
This commit is contained in:
Kamron Batman 2018-09-09 08:54:10 -07:00
parent 74f498c1c8
commit d6c0bf2d4c
96 changed files with 350 additions and 579 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Scripts/Items/Skill Items/Camping/Campfire.cs
View file

@ -159,8 +159,7 @@ namespace Server.Items
public override void OnAfterDelete()
{
if ( m_Timer != null )
m_Timer.Stop();
m_Timer?.Stop();
ClearEntries();
}

3
Scripts/Items/Skill Items/Misc/Bandage.cs
View file

@ -192,8 +192,7 @@ namespace Server.Items
{
m_Table.Remove( m_Healer );
if ( m_Timer != null )
m_Timer.Stop();
m_Timer?.Stop();
m_Timer = null;
}

2
Scripts/Items/Skill Items/Misc/RecipeScroll.cs
View file

@ -67,7 +67,7 @@ namespace Server.Items
Recipe r = this.Recipe;
if ( r != null && @from is PlayerMobile pm )
if ( r != null && from is PlayerMobile pm )
{
if ( !pm.HasRecipe( r ) )
{

4
Scripts/Items/Skill Items/Musical Instruments/BaseInstrument.cs
View file

@ -165,7 +165,7 @@ namespace Server.Items
public static BaseInstrument GetInstrument( Mobile from )
{
if ( !(m_Instruments[@from] is BaseInstrument item) )
if ( !(m_Instruments[from] is BaseInstrument item) )
return null;
if ( !item.IsChildOf( from.Backpack ) )
@ -210,7 +210,7 @@ namespace Server.Items
InstrumentPickedCallback callback = state as InstrumentPickedCallback;
callback?.Invoke( @from, instrument );
callback?.Invoke( from, instrument );
}
}

2
Scripts/Items/Skill Items/Tinkering/Spyglass.cs
View file

@ -26,7 +26,7 @@ namespace Server.Items
from.Send( new MessageLocalizedAffix( from.Serial, from.Body, MessageType.Regular, 0x3B2, 3, 1008146 + (int)Clock.GetMoonPhase( Map.Trammel, from.X, from.Y ), "", AffixType.Prepend, "Trammel : ", "" ) );
from.Send( new MessageLocalizedAffix( from.Serial, from.Body, MessageType.Regular, 0x3B2, 3, 1008146 + (int)Clock.GetMoonPhase( Map.Felucca, from.X, from.Y ), "", AffixType.Prepend, "Felucca : ", "" ) );
if ( @from is PlayerMobile player )
if ( from is PlayerMobile player )
{
QuestSystem qs = player.Quest;