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

Removes redundant delegate type declarations

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

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

@ -563,25 +563,25 @@ namespace Server.Spells
private delegate bool TravelValidator( Map map, Point3D loc );
private static TravelValidator[] m_Validators = {
new TravelValidator( IsFeluccaT2A ),
new TravelValidator( IsKhaldun ),
new TravelValidator( IsIlshenar ),
new TravelValidator( IsTrammelWind ),
new TravelValidator( IsFeluccaWind ),
new TravelValidator( IsFeluccaDungeon ),
new TravelValidator( IsTrammelSolenHive ),
new TravelValidator( IsFeluccaSolenHive ),
new TravelValidator( IsCrystalCave ),
new TravelValidator( IsDoomGauntlet ),
new TravelValidator( IsDoomFerry ),
new TravelValidator( IsSafeZone ),
new TravelValidator( IsFactionStronghold ),
new TravelValidator( IsChampionSpawn ),
new TravelValidator( IsTokunoDungeon ),
new TravelValidator( IsLampRoom ),
new TravelValidator( IsGuardianRoom ),
new TravelValidator( IsHeartwood ),
new TravelValidator( IsMLDungeon )
IsFeluccaT2A,
IsKhaldun,
IsIlshenar,
IsTrammelWind,
IsFeluccaWind,
IsFeluccaDungeon,
IsTrammelSolenHive,
IsFeluccaSolenHive,
IsCrystalCave,
IsDoomGauntlet,
IsDoomFerry,
IsSafeZone,
IsFactionStronghold,
IsChampionSpawn,
IsTokunoDungeon,
IsLampRoom,
IsGuardianRoom,
IsHeartwood,
IsMLDungeon
};
private static bool[,] m_Rules = {

4
Scripts/Spells/Mysticism/SpellPlagueSpell.cs
View file

@ -8,7 +8,7 @@ namespace Server.Spells.Mysticism
{
public static void Initialize()
{
EventSink.PlayerDeath += new PlayerDeathEventHandler( OnPlayerDeath );
EventSink.PlayerDeath += OnPlayerDeath;
}
private static SpellInfo m_Info = new SpellInfo(
@ -149,7 +149,7 @@ namespace Server.Spells.Mysticism
public void Start()
{
m_Timer = Timer.DelayCall( TimeSpan.FromSeconds( 8.0 ), new TimerCallback( EndPlague ) );
m_Timer = Timer.DelayCall( TimeSpan.FromSeconds( 8.0 ), EndPlague );
m_Timer.Start();
BuffInfo.AddBuff( m_Target, new BuffInfo( BuffIcon.SpellPlague, 1031690, 1080167, TimeSpan.FromSeconds( 8.5 ), m_Target ) );

2
Scripts/Spells/Necromancy/AnimateDeadSpell.cs
View file

@ -266,7 +266,7 @@ namespace Server.Spells.Necromancy
list.Add( summoned );
if ( list.Count > 3 )
Timer.DelayCall( TimeSpan.Zero, new TimerCallback( list[0].Kill ) );
Timer.DelayCall( TimeSpan.Zero, list[0].Kill );
Timer.DelayCall( TimeSpan.FromSeconds( 2.0 ), TimeSpan.FromSeconds( 2.0 ), new TimerStateCallback( Summoned_Damage ), summoned );
}

6
Scripts/Spells/Ninjitsu/AnimalForm.cs
View file

@ -13,7 +13,7 @@ namespace Server.Spells.Ninjitsu
{
public static void Initialize()
{
EventSink.Login += new LoginEventHandler(OnLogin);
EventSink.Login += OnLogin;
}
public static void OnLogin(LoginEventArgs e)
@ -584,7 +584,7 @@ namespace Server.Spells.Ninjitsu
m_Mobile.Freeze(TimeSpan.FromSeconds(1));
m_Mobile.PlaySound(0x16A);
DelayCall<Mobile>(TimeSpan.FromSeconds(1.3), new TimerStateCallback<Mobile>(BreathEffect_Callback), m_LastTarget);
DelayCall<Mobile>(TimeSpan.FromSeconds(1.3), BreathEffect_Callback, m_LastTarget);
}
m_Counter = Math.Min((int)m_Mobile.GetDistanceToSqrt(m_LastTarget), 10);
@ -601,7 +601,7 @@ namespace Server.Spells.Ninjitsu
m_Mobile.PlaySound(0x227);
Effects.SendMovingEffect(m_Mobile, target, 0x36D4, 5, 0, false, false, 0, 0);
DelayCall<Mobile>(TimeSpan.FromSeconds(1), new TimerStateCallback<Mobile>(BreathDamage_Callback), target);
DelayCall<Mobile>(TimeSpan.FromSeconds(1), BreathDamage_Callback, target);
}
}

6
Scripts/Spells/Spellweaving/EtherealVoyage.cs
View file

@ -24,13 +24,13 @@ namespace Server.Spells.Spellweaving
public static void Initialize()
{
EventSink.AggressiveAction += new AggressiveActionEventHandler( delegate( AggressiveActionEventArgs e )
EventSink.AggressiveAction += delegate( AggressiveActionEventArgs e )
{
if ( TransformationSpellHelper.UnderTransformation( e.Aggressor, typeof( EtherealVoyageSpell ) ) )
{
TransformationSpellHelper.RemoveContext( e.Aggressor, true );
}
} );
};
}
public override bool CheckCast()
@ -64,7 +64,7 @@ namespace Server.Spells.Spellweaving
TimeSpan duration = TimeSpan.FromSeconds( 12 + (int)(skill / 24) + (FocusLevel * 2) );
Timer.DelayCall<Mobile>( duration, new TimerStateCallback<Mobile>( RemoveEffect ), Caster );
Timer.DelayCall<Mobile>( duration, RemoveEffect, Caster );
Caster.BeginAction( typeof( EtherealVoyageSpell ) ); //Cannot cast this spell for another 5 minutes(300sec) after effect removed.

6
Scripts/Spells/Spellweaving/GiftOfLife.cs
View file

@ -25,10 +25,10 @@ namespace Server.Spells.Spellweaving
public static void Initialize()
{
EventSink.PlayerDeath += new PlayerDeathEventHandler( delegate( PlayerDeathEventArgs e )
EventSink.PlayerDeath += delegate( PlayerDeathEventArgs e )
{
HandleDeath( e.Mobile );
} );
};
}
public override void OnCast()
@ -93,7 +93,7 @@ namespace Server.Spells.Spellweaving
public static void HandleDeath( Mobile m )
{
if ( m_Table.ContainsKey( m ) )
Timer.DelayCall<Mobile>( TimeSpan.FromSeconds( Utility.RandomMinMax( 2, 4 ) ), new TimerStateCallback<Mobile>( HandleDeath_OnCallback ), m );
Timer.DelayCall<Mobile>( TimeSpan.FromSeconds( Utility.RandomMinMax( 2, 4 ) ), HandleDeath_OnCallback, m );
}
private static void HandleDeath_OnCallback( Mobile m )

4
Scripts/Spells/Spellweaving/Items/TransientItem.cs
View file

@ -73,7 +73,7 @@ namespace Server.Items
m_CreationTime = DateTime.UtcNow;
m_LifeSpan = lifeSpan;
m_Timer = Timer.DelayCall( TimeSpan.FromSeconds( 5 ), TimeSpan.FromSeconds( 5 ), new TimerCallback( CheckExpiry ) );
m_Timer = Timer.DelayCall( TimeSpan.FromSeconds( 5 ), TimeSpan.FromSeconds( 5 ), CheckExpiry );
}
public TransientItem( Serial serial )
@ -107,7 +107,7 @@ namespace Server.Items
m_LifeSpan = reader.ReadTimeSpan();
m_CreationTime = reader.ReadDateTime();
m_Timer = Timer.DelayCall( TimeSpan.FromSeconds( 5 ), TimeSpan.FromSeconds( 5 ), new TimerCallback( CheckExpiry ) );
m_Timer = Timer.DelayCall( TimeSpan.FromSeconds( 5 ), TimeSpan.FromSeconds( 5 ), CheckExpiry );
}
}
}

2
Scripts/Spells/Spellweaving/ReaperForm.cs
View file

@ -11,7 +11,7 @@ namespace Server.Spells.Spellweaving
public static void Initialize()
{
EventSink.Login += new LoginEventHandler( OnLogin );
EventSink.Login += OnLogin;
}
public static void OnLogin( LoginEventArgs e )