Removes redundant delegate type declarations

This commit is contained in:
Kamron Batman 2018-09-14 14:32:04 -07:00
parent 3c9842ee5a
commit c85b0a740c
317 changed files with 898 additions and 903 deletions

View file

@ -2293,7 +2293,7 @@ namespace Server.Mobiles
else if (!DoMove(m_Mobile.GetDirectionTo(m), true))
{
m_Path = new PathFollower(m_Mobile, m);
m_Path.Mover = new MoveMethod(DoMoveImpl);
m_Path.Mover = DoMoveImpl;
if (m_Path.Follow(run, 1))
{
@ -2358,7 +2358,7 @@ namespace Server.Mobiles
if (!DoMove(dirTo, true) && needCloser)
{
m_Path = new PathFollower(m_Mobile, m);
m_Path.Mover = new MoveMethod(DoMoveImpl);
m_Path.Mover = DoMoveImpl;
if (m_Path.Follow(bRun, 1))
m_Path = null;
@ -2647,12 +2647,12 @@ namespace Server.Mobiles
{
if (!m_Mobile.Region.AcceptsSpawnsFrom(se.Region))
{
Timer.DelayCall(TimeSpan.Zero, new TimerCallback(ReturnToHome));
Timer.DelayCall(TimeSpan.Zero, ReturnToHome);
}
}
else if (!m_Mobile.InRange(se.HomeLocation, se.HomeRange))
{
Timer.DelayCall(TimeSpan.Zero, new TimerCallback(ReturnToHome));
Timer.DelayCall(TimeSpan.Zero, ReturnToHome);
}
}
}

View file

@ -7,9 +7,9 @@ namespace Server.Mobiles
{
public class HealerAI : BaseAI
{
private static NeedDelegate m_Cure = new NeedDelegate( NeedCure );
private static NeedDelegate m_GHeal = new NeedDelegate( NeedGHeal );
private static NeedDelegate m_LHeal = new NeedDelegate( NeedLHeal );
private static NeedDelegate m_Cure = NeedCure;
private static NeedDelegate m_GHeal = NeedGHeal;
private static NeedDelegate m_LHeal = NeedLHeal;
private static NeedDelegate[] m_ACure = { m_Cure };
private static NeedDelegate[] m_AGHeal = { m_GHeal };
private static NeedDelegate[] m_ALHeal = { m_LHeal };

View file

@ -1427,7 +1427,7 @@ namespace Server.Mobiles
}
else if ( from is PlayerMobile mobile )
{
Timer.DelayCall( TimeSpan.FromSeconds( 10 ), new TimerCallback( mobile.RecoverAmmo ) );
Timer.DelayCall( TimeSpan.FromSeconds( 10 ), mobile.RecoverAmmo );
}
base.OnDamage( amount, from, willKill );
@ -3460,10 +3460,10 @@ namespace Server.Mobiles
Say( 1013037 + Utility.Random( 16 ) );
guardedRegion.CallGuards( Location );
Timer.DelayCall( TimeSpan.FromSeconds( 5.0 ), new TimerCallback( ReleaseGuardLock ) );
Timer.DelayCall( TimeSpan.FromSeconds( 5.0 ), ReleaseGuardLock );
m_NoDupeGuards = m;
Timer.DelayCall( TimeSpan.Zero, new TimerCallback( ReleaseGuardDupeLock ) );
Timer.DelayCall( TimeSpan.Zero, ReleaseGuardDupeLock );
}
}
}
@ -5359,7 +5359,7 @@ namespace Server.Mobiles
{
if ( !Deleted && ReturnsToHome && IsSpawnerBound() && !InRange( Home, ( RangeHome + 5 ) ) )
{
Timer.DelayCall( TimeSpan.FromSeconds( ( Utility.Random( 45 ) + 15 ) ), new TimerCallback( GoHome_Callback ) );
Timer.DelayCall( TimeSpan.FromSeconds( ( Utility.Random( 45 ) + 15 ) ), GoHome_Callback );
m_ReturnQueued = true;
}

View file

@ -114,7 +114,7 @@ namespace Server.Mobiles
Container pack = Backpack;
if ( pack != null && pack.Items.Count > 0 )
from.SendGump( new WarningGump( 1060635, 30720, 1061672, 32512, 420, 280, new WarningGumpCallback( ConfirmRelease_Callback ), null ) );
from.SendGump( new WarningGump( 1060635, 30720, 1061672, 32512, 420, 280, ConfirmRelease_Callback, null ) );
else
EndRelease( from );
}

View file

@ -52,7 +52,7 @@ namespace Server.Mobiles
FixedEffect( 0x37C4, 1, 12, 1109, 6 );
PlaySound( 0x1D3 );
Timer.DelayCall( TimeSpan.FromSeconds( 0.5 ), new TimerCallback( Flare ) );
Timer.DelayCall( TimeSpan.FromSeconds( 0.5 ), Flare );
}
private void Flare()

View file

@ -147,7 +147,7 @@ namespace Server.Mobiles
Effects.PlaySound( to, map, 0x1FE );
m_HasTeleportedAway = true;
m_SoundTimer = Timer.DelayCall( TimeSpan.FromSeconds( 5.0 ), TimeSpan.FromSeconds( 2.5 ), new TimerCallback( SendTrackingSound ) );
m_SoundTimer = Timer.DelayCall( TimeSpan.FromSeconds( 5.0 ), TimeSpan.FromSeconds( 2.5 ), SendTrackingSound );
Frozen = true;

View file

@ -138,7 +138,7 @@ namespace Server.Mobiles
dancer.AIObject.NextMove = Core.TickCount + 1000;
}
Timer.DelayCall( TimeSpan.FromSeconds( 1.0 ), new TimerCallback( EndSavageDance ) );
Timer.DelayCall( TimeSpan.FromSeconds( 1.0 ), EndSavageDance );
}
}

View file

@ -10,7 +10,7 @@ namespace Server.Mobiles
public static void Initialize()
{
EventSink.PlayerDeath += new PlayerDeathEventHandler( EventSink_PlayerDeath );
EventSink.PlayerDeath += EventSink_PlayerDeath;
}
public static void EventSink_PlayerDeath( PlayerDeathEventArgs e )

View file

@ -83,7 +83,7 @@ namespace Server.Mobiles
Say( true, "Beware, mortals! You have provoked my wrath!" );
FixedParticles( 0x376A, 10, 10, 9537, 33, 0, EffectLayer.Waist );
Timer.DelayCall( TimeSpan.FromSeconds( 5.0 ), new TimerCallback( DoAreaLeech_Finish ) );
Timer.DelayCall( TimeSpan.FromSeconds( 5.0 ), DoAreaLeech_Finish );
}
private void DoAreaLeech_Finish()

View file

@ -76,11 +76,11 @@ namespace Server.Mobiles
Say( m_Vocabulary[ Utility.Random( m_Vocabulary.Length ) ] );
if ( to != null && Utility.RandomBool() )
Timer.DelayCall( TimeSpan.FromSeconds( Utility.RandomMinMax( 5, 8 ) ), new TimerCallback( delegate { to.Talk(); } ) );
Timer.DelayCall( TimeSpan.FromSeconds( Utility.RandomMinMax( 5, 8 ) ), delegate { to.Talk(); } );
m_CanTalk = false;
Timer.DelayCall( TimeSpan.FromSeconds( Utility.RandomMinMax( 20, 30 ) ), new TimerCallback( delegate { m_CanTalk = true; } ) );
Timer.DelayCall( TimeSpan.FromSeconds( Utility.RandomMinMax( 20, 30 ) ), delegate { m_CanTalk = true; } );
}
}

View file

@ -70,7 +70,7 @@ namespace Server.Mobiles
PackTalismans(5);
}
Timer.DelayCall(TimeSpan.FromSeconds(1), new TimerCallback(SpawnTormented));
Timer.DelayCall(TimeSpan.FromSeconds(1), SpawnTormented);
}
public virtual void PackResources(int amount)

View file

@ -61,7 +61,7 @@ namespace Server.Mobiles
Movable = false;
Hue = 1;
Timer.DelayCall( TimeSpan.FromSeconds( 40.0 ), new TimerCallback( Delete ) );
Timer.DelayCall( TimeSpan.FromSeconds( 40.0 ), Delete );
}
public BunnyHole( Serial serial ) : base( serial )
@ -87,7 +87,7 @@ namespace Server.Mobiles
public virtual void DelayBeginTunnel()
{
Timer.DelayCall( TimeSpan.FromMinutes( 3.0 ), new TimerCallback( BeginTunnel ) );
Timer.DelayCall( TimeSpan.FromMinutes( 3.0 ), BeginTunnel );
}
public virtual void BeginTunnel()
@ -101,7 +101,7 @@ namespace Server.Mobiles
Say( "* The bunny begins to dig a tunnel back to its underground lair *" );
PlaySound( 0x247 );
Timer.DelayCall( TimeSpan.FromSeconds( 5.0 ), new TimerCallback( Delete ) );
Timer.DelayCall( TimeSpan.FromSeconds( 5.0 ), Delete );
}
public override int Meat => 1;

View file

@ -175,7 +175,7 @@ namespace Server.Mobiles
m_Timer = new DecayTimer( this );
m_Timer.Start();
Timer.DelayCall( TimeSpan.Zero, new TimerCallback( BroadcastMessage ) );
Timer.DelayCall( TimeSpan.Zero, BroadcastMessage );
}
private void BroadcastMessage()
@ -225,7 +225,7 @@ namespace Server.Mobiles
}
from.LocalOverheadMessage( MessageType.Regular, 0x21, 1071904 ); // * You slice through the plague beast's amorphous tissue *
Timer.DelayCall<Mobile>( TimeSpan.Zero, new TimerStateCallback<Mobile>( pack.Open ), from );
Timer.DelayCall<Mobile>( TimeSpan.Zero, pack.Open, from );
}
}

View file

@ -67,7 +67,7 @@ namespace Server.Mobiles
public override void OnCombatantChange()
{
if ( Combatant == null && !IsBodyMod && !Controlled && m_DisguiseTimer == null && Utility.RandomBool() )
m_DisguiseTimer = Timer.DelayCall( TimeSpan.FromSeconds( Utility.RandomMinMax( 15, 30 ) ), new TimerCallback( Disguise ) );
m_DisguiseTimer = Timer.DelayCall( TimeSpan.FromSeconds( Utility.RandomMinMax( 15, 30 ) ), Disguise );
}
public override bool OnBeforeDeath()
@ -119,7 +119,7 @@ namespace Server.Mobiles
AddItem( new Robe( Utility.RandomNondyedHue() ) );
m_DisguiseTimer = null;
m_DisguiseTimer = Timer.DelayCall( TimeSpan.FromSeconds( 75 ), new TimerCallback( RemoveDisguise ) );
m_DisguiseTimer = Timer.DelayCall( TimeSpan.FromSeconds( 75 ), RemoveDisguise );
}
public void RemoveDisguise()
@ -270,7 +270,7 @@ namespace Server.Mobiles
SetResistance( ResistanceType.Energy, 40, 60 );
}
Timer.DelayCall( TimeSpan.Zero, new TimerCallback( RemoveDisguise ) );
Timer.DelayCall( TimeSpan.Zero, RemoveDisguise );
}
}
}

View file

@ -688,16 +688,16 @@ namespace Server.Mobiles
public static void Initialize()
{
if ( FastwalkPrevention )
PacketHandlers.RegisterThrottler( 0x02, new ThrottlePacketCallback( MovementThrottle_Callback ) );
PacketHandlers.RegisterThrottler( 0x02, MovementThrottle_Callback );
EventSink.Login += new LoginEventHandler( OnLogin );
EventSink.Logout += new LogoutEventHandler( OnLogout );
EventSink.Connected += new ConnectedEventHandler( EventSink_Connected );
EventSink.Disconnected += new DisconnectedEventHandler( EventSink_Disconnected );
EventSink.Login += OnLogin;
EventSink.Logout += OnLogout;
EventSink.Connected += EventSink_Connected;
EventSink.Disconnected += EventSink_Disconnected;
if ( Core.SE )
{
Timer.DelayCall( TimeSpan.Zero, new TimerCallback( CheckPets ) );
Timer.DelayCall( TimeSpan.Zero, CheckPets );
}
}
@ -734,7 +734,7 @@ namespace Server.Mobiles
{
m_Type = type;
m_Timer = Timer.DelayCall( duration, new TimerStateCallback<Mobile>( RemoveBlock ), mobile );
m_Timer = Timer.DelayCall( duration, RemoveBlock, mobile );
}
private void RemoveBlock( Mobile mobile )
@ -917,7 +917,7 @@ namespace Server.Mobiles
return;
m_NoDeltaRecursion = true;
Timer.DelayCall( TimeSpan.Zero, new TimerCallback( ValidateEquipment_Sandbox ) );
Timer.DelayCall( TimeSpan.Zero, ValidateEquipment_Sandbox );
}
private void ValidateEquipment_Sandbox()
@ -1588,21 +1588,21 @@ namespace Server.Mobiles
if ( InsuranceEnabled )
{
if ( Core.SA )
list.Add( new CallbackEntry( 1114299, new ContextCallback( OpenItemInsuranceMenu ) ) ); // Open Item Insurance Menu
list.Add( new CallbackEntry( 1114299, OpenItemInsuranceMenu ) ); // Open Item Insurance Menu
list.Add( new CallbackEntry( 6201, new ContextCallback( ToggleItemInsurance ) ) ); // Toggle Item Insurance
list.Add( new CallbackEntry( 6201, ToggleItemInsurance ) ); // Toggle Item Insurance
if ( !Core.SA )
{
if ( AutoRenewInsurance )
list.Add( new CallbackEntry( 6202, new ContextCallback( CancelRenewInventoryInsurance ) ) ); // Cancel Renewing Inventory Insurance
list.Add( new CallbackEntry( 6202, CancelRenewInventoryInsurance ) ); // Cancel Renewing Inventory Insurance
else
list.Add( new CallbackEntry( 6200, new ContextCallback( AutoRenewInventoryInsurance ) ) ); // Auto Renew Inventory Insurance
list.Add( new CallbackEntry( 6200, AutoRenewInventoryInsurance ) ); // Auto Renew Inventory Insurance
}
}
if ( MLQuestSystem.Enabled )
list.Add( new CallbackEntry( 6169, new ContextCallback( ToggleQuestItem ) ) ); // Toggle Quest Item
list.Add( new CallbackEntry( 6169, ToggleQuestItem ) ); // Toggle Quest Item
}
BaseHouse house = BaseHouse.FindHouseAt( this );
@ -1610,24 +1610,24 @@ namespace Server.Mobiles
if ( house != null )
{
if ( Alive && house.InternalizedVendors.Count > 0 && house.IsOwner( this ) )
list.Add( new CallbackEntry( 6204, new ContextCallback( GetVendor ) ) );
list.Add( new CallbackEntry( 6204, GetVendor ) );
if ( house.IsAosRules && !Region.IsPartOf( typeof( Engines.ConPVP.SafeZone ) ) ) // Dueling
list.Add( new CallbackEntry( 6207, new ContextCallback( LeaveHouse ) ) );
list.Add( new CallbackEntry( 6207, LeaveHouse ) );
}
if ( m_JusticeProtectors.Count > 0 )
list.Add( new CallbackEntry( 6157, new ContextCallback( CancelProtection ) ) );
list.Add( new CallbackEntry( 6157, CancelProtection ) );
if ( Alive )
list.Add( new CallbackEntry( 6210, new ContextCallback( ToggleChampionTitleDisplay ) ) );
list.Add( new CallbackEntry( 6210, ToggleChampionTitleDisplay ) );
if ( Core.HS )
{
NetState ns = from.NetState;
if ( ns != null && ns.ExtendedStatus )
list.Add( new CallbackEntry( RefuseTrades ? 1154112 : 1154113, new ContextCallback( ToggleTrades ) ) ); // Allow Trades / Refuse Trades
list.Add( new CallbackEntry( RefuseTrades ? 1154112 : 1154113, ToggleTrades ) ); // Allow Trades / Refuse Trades
}
}
else
@ -1690,7 +1690,7 @@ namespace Server.Mobiles
if ( !CheckAlive() )
return;
BeginTarget( -1, false, TargetFlags.None, new TargetCallback( ToggleItemInsurance_Callback ) );
BeginTarget( -1, false, TargetFlags.None, ToggleItemInsurance_Callback );
SendLocalizedMessage( 1060868 ); // Target the item you wish to toggle insurance status on <ESC> to cancel
}
@ -1733,7 +1733,7 @@ namespace Server.Mobiles
if ( item == null || !item.IsChildOf( this ) )
{
if ( target )
BeginTarget( -1, false, TargetFlags.None, new TargetCallback( ToggleItemInsurance_Callback ) );
BeginTarget( -1, false, TargetFlags.None, ToggleItemInsurance_Callback );
SendLocalizedMessage( 1060871, "", 0x23 ); // You can only insure items that you have equipped or that are in your backpack
}
@ -1745,14 +1745,14 @@ namespace Server.Mobiles
if ( target )
{
BeginTarget( -1, false, TargetFlags.None, new TargetCallback( ToggleItemInsurance_Callback ) );
BeginTarget( -1, false, TargetFlags.None, ToggleItemInsurance_Callback );
SendLocalizedMessage( 1060868, "", 0x23 ); // Target the item you wish to toggle insurance status on <ESC> to cancel
}
}
else if ( !CanInsure( item ) )
{
if ( target )
BeginTarget( -1, false, TargetFlags.None, new TargetCallback( ToggleItemInsurance_Callback ) );
BeginTarget( -1, false, TargetFlags.None, ToggleItemInsurance_Callback );
SendLocalizedMessage( 1060869, "", 0x23 ); // You cannot insure that
}
@ -1780,7 +1780,7 @@ namespace Server.Mobiles
if ( target )
{
BeginTarget( -1, false, TargetFlags.None, new TargetCallback( ToggleItemInsurance_Callback ) );
BeginTarget( -1, false, TargetFlags.None, ToggleItemInsurance_Callback );
SendLocalizedMessage( 1060868, "", 0x23 ); // Target the item you wish to toggle insurance status on <ESC> to cancel
}
}
@ -2133,7 +2133,7 @@ namespace Server.Mobiles
//CloseGump( typeof( UnknownGump802 ) );
//CloseGump( typeof( UnknownGump804 ) );
BeginTarget( -1, false, TargetFlags.None, new TargetCallback( ToggleQuestItem_Callback ) );
BeginTarget( -1, false, TargetFlags.None, ToggleQuestItem_Callback );
SendLocalizedMessage( 1072352 ); // Target the item you wish to toggle Quest Item status on <ESC> to cancel
}
@ -2530,7 +2530,7 @@ namespace Server.Mobiles
m_SentHonorContext?.OnSourceDamaged( @from, amount );
if ( willKill && @from is PlayerMobile mobile )
Timer.DelayCall( TimeSpan.FromSeconds( 10 ), new TimerCallback( mobile.RecoverAmmo ) );
Timer.DelayCall( TimeSpan.FromSeconds( 10 ), mobile.RecoverAmmo );
base.OnDamage( amount, from, willKill );
}
@ -2564,7 +2564,7 @@ namespace Server.Mobiles
public override void OnWarmodeChanged()
{
if ( !Warmode )
Timer.DelayCall( TimeSpan.FromSeconds( 10 ), new TimerCallback( RecoverAmmo ) );
Timer.DelayCall( TimeSpan.FromSeconds( 10 ), RecoverAmmo );
}
private Mobile m_InsuranceAward;
@ -2815,7 +2815,7 @@ namespace Server.Mobiles
if ( Young && m_DuelContext == null )
{
if ( YoungDeathTeleport() )
Timer.DelayCall( TimeSpan.FromSeconds( 2.5 ), new TimerCallback( SendYoungDeathNotice ) );
Timer.DelayCall( TimeSpan.FromSeconds( 2.5 ), SendYoungDeathNotice );
}
if ( m_DuelContext == null || !m_DuelContext.Registered || !m_DuelContext.Started || m_DuelPlayer == null || m_DuelPlayer.Eliminated )
@ -4993,7 +4993,7 @@ namespace Server.Mobiles
if (pet.Map != Map)
{
pet.PlaySound( pet.GetAngerSound() );
Timer.DelayCall( TimeSpan.Zero, new TimerCallback( pet.Delete ) );
Timer.DelayCall( TimeSpan.Zero, pet.Delete );
}
continue;
}

View file

@ -388,7 +388,7 @@ namespace Server.Mobiles
SetControlMaster(null);
m_EscortTable.Remove(master);
Timer.DelayCall(TimeSpan.FromSeconds(5.0), new TimerCallback(Delete));
Timer.DelayCall(TimeSpan.FromSeconds(5.0), Delete);
return null;
}
else

View file

@ -23,7 +23,7 @@ namespace Server.Mobiles
public static void Initialize()
{
CommandSystem.Register( "TownCriers", AccessLevel.GameMaster, new CommandEventHandler( TownCriers_OnCommand ) );
CommandSystem.Register( "TownCriers", AccessLevel.GameMaster, TownCriers_OnCommand );
}
[Usage( "TownCriers" )]
@ -354,7 +354,7 @@ namespace Server.Mobiles
public void ForceBeginAutoShout()
{
if ( m_AutoShoutTimer == null )
m_AutoShoutTimer = Timer.DelayCall( TimeSpan.FromSeconds( 5.0 ), TimeSpan.FromMinutes( 1.0 ), new TimerCallback( AutoShout_Callback ) );
m_AutoShoutTimer = Timer.DelayCall( TimeSpan.FromSeconds( 5.0 ), TimeSpan.FromMinutes( 1.0 ), AutoShout_Callback );
}
public TownCrierEntry AddEntry( string[] lines, TimeSpan duration )
@ -367,7 +367,7 @@ namespace Server.Mobiles
m_Entries.Add( tce );
if ( m_AutoShoutTimer == null )
m_AutoShoutTimer = Timer.DelayCall( TimeSpan.FromSeconds( 5.0 ), TimeSpan.FromMinutes( 1.0 ), new TimerCallback( AutoShout_Callback ) );
m_AutoShoutTimer = Timer.DelayCall( TimeSpan.FromSeconds( 5.0 ), TimeSpan.FromMinutes( 1.0 ), AutoShout_Callback );
return tce;
}

View file

@ -1369,7 +1369,7 @@ namespace Server.Mobiles
if ( IsParagon )
IsParagon = false;
Timer.DelayCall( TimeSpan.Zero, new TimerCallback( CheckMorph ) );
Timer.DelayCall( TimeSpan.Zero, CheckMorph );
}
public override void AddCustomContextEntries( Mobile from, List<ContextMenuEntry> list )

View file

@ -58,7 +58,7 @@ namespace Server.Mobiles
if ( !e.Handled && e.Mobile.Alive && e.HasKeyword( 0x38 ) ) // *appraise*
{
PublicOverheadMessage( MessageType.Regular, 0x3B2, 500608 ); // Which deed would you like appraised?
e.Mobile.BeginTarget( 12, false, TargetFlags.None, new TargetCallback( Appraise_OnTarget ) );
e.Mobile.BeginTarget( 12, false, TargetFlags.None, Appraise_OnTarget );
e.Handled = true;
}

View file

@ -551,7 +551,7 @@ namespace Server.Mobiles
}
if ( version < 1 )
Timer.DelayCall( TimeSpan.Zero, new TimerCallback( UpgradeFromVersion0 ) );
Timer.DelayCall( TimeSpan.Zero, UpgradeFromVersion0 );
}
private void UpgradeFromVersion0()

View file

@ -412,7 +412,7 @@ namespace Server.Mobiles
}
else
{
Timer.DelayCall( TimeSpan.Zero, new TimerCallback( FixDresswear ) );
Timer.DelayCall( TimeSpan.Zero, FixDresswear );
}
m_NextPayTime = DateTime.UtcNow + PayTimer.GetInterval();
@ -1722,7 +1722,7 @@ namespace Server.Mobiles
m_Vendor = (PlayerVendor) reader.ReadMobile();
Timer.DelayCall( TimeSpan.Zero, new TimerCallback( Delete ) );
Timer.DelayCall( TimeSpan.Zero, Delete );
}
}
}

View file

@ -119,7 +119,7 @@ namespace Server.Mobiles
if ( m_Items.Count == 0 && m_Gold == 0 )
{
Timer.DelayCall( TimeSpan.Zero, new TimerCallback( Delete ) );
Timer.DelayCall( TimeSpan.Zero, Delete );
}
else
{