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

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

2
Scripts/Engines/ConPVP/AcceptDuelGump.cs
View file

@ -97,7 +97,7 @@ namespace Server.Engines.ConPVP
AddButton( 314, 173, 247, 248, 1, GumpButtonType.Reply, 0 );
Timer.DelayCall( TimeSpan.FromSeconds( 15.0 ), new TimerCallback( AutoReject ) );
Timer.DelayCall( TimeSpan.FromSeconds( 15.0 ), AutoReject );
}
public void AutoReject()

4
Scripts/Engines/ConPVP/Arena.cs
View file

@ -575,10 +575,10 @@ namespace Server.Engines.ConPVP
m_Region = new SafeZone( m_Zone, m_Outside, m_Facet, m_IsGuarded );
if ( IsOccupied )
Timer.DelayCall( TimeSpan.FromSeconds( 2.0 ), new TimerCallback( Evict ) );
Timer.DelayCall( TimeSpan.FromSeconds( 2.0 ), Evict );
if ( m_Tournament != null )
Timer.DelayCall( TimeSpan.Zero, new TimerCallback( AttachToTournament_Sandbox ) );
Timer.DelayCall( TimeSpan.Zero, AttachToTournament_Sandbox );
}
private void AttachToTournament_Sandbox()

30
Scripts/Engines/ConPVP/DuelContext.cs
View file

@ -673,7 +673,7 @@ namespace Server.Engines.ConPVP
m_EventGame?.OnStop();
Timer.DelayCall( TimeSpan.FromSeconds( 9.0 ), new TimerCallback( UnregisterRematch ) );
Timer.DelayCall( TimeSpan.FromSeconds( 9.0 ), UnregisterRematch );
}
public void Award( Mobile us, Mobile them, bool won )
@ -918,11 +918,11 @@ namespace Server.Engines.ConPVP
{
m_SDWarnTimer?.Stop();
m_SDWarnTimer = Timer.DelayCall( TimeSpan.FromMinutes( timeUntilActive.TotalMinutes * 0.9 ), new TimerCallback( WarnSuddenDeath ) );
m_SDWarnTimer = Timer.DelayCall( TimeSpan.FromMinutes( timeUntilActive.TotalMinutes * 0.9 ), WarnSuddenDeath );
m_SDActivateTimer?.Stop();
m_SDActivateTimer = Timer.DelayCall( timeUntilActive, new TimerCallback( ActivateSuddenDeath ) );
m_SDActivateTimer = Timer.DelayCall( timeUntilActive, ActivateSuddenDeath );
}
public void WarnSuddenDeath()
@ -992,7 +992,7 @@ namespace Server.Engines.ConPVP
? AutoTieDelay
: TimeSpan.FromMinutes( 90.0 );
m_AutoTieTimer = Timer.DelayCall( ts, new TimerCallback( InvokeAutoTie ) );
m_AutoTieTimer = Timer.DelayCall( ts, InvokeAutoTie );
}
public void EndAutoTie()
@ -1054,7 +1054,7 @@ namespace Server.Engines.ConPVP
m_Tournament?.HandleTie( m_Arena, m_Match, remaining );
Timer.DelayCall( TimeSpan.FromSeconds( 10.0 ), new TimerCallback( Unregister ) );
Timer.DelayCall( TimeSpan.FromSeconds( 10.0 ), Unregister );
}
public bool IsOneVsOne
@ -1076,15 +1076,15 @@ namespace Server.Engines.ConPVP
public static void Initialize()
{
EventSink.Speech += new SpeechEventHandler( EventSink_Speech );
EventSink.Login += new LoginEventHandler( EventSink_Login );
EventSink.Speech += EventSink_Speech;
EventSink.Login += EventSink_Login;
CommandSystem.Register( "vli", AccessLevel.GameMaster, new CommandEventHandler( vli_oc ) );
CommandSystem.Register( "vli", AccessLevel.GameMaster, vli_oc );
}
private static void vli_oc( CommandEventArgs e )
{
e.Mobile.BeginTarget( -1, false, Targeting.TargetFlags.None, new TargetCallback( vli_ot ) );
e.Mobile.BeginTarget( -1, false, Targeting.TargetFlags.None, vli_ot );
}
private static void vli_ot( Mobile from, object obj )
@ -2186,7 +2186,7 @@ namespace Server.Engines.ConPVP
TitleColor = 0x7800;
TitleNumber = 1062051; // Gate Warning
Timer.DelayCall( TimeSpan.FromSeconds( 10.0 ), new TimerCallback( Delete ) );
Timer.DelayCall( TimeSpan.FromSeconds( 10.0 ), Delete );
}
public override void CheckGate(Mobile m, int range)
@ -2376,7 +2376,7 @@ namespace Server.Engines.ConPVP
}
}
StartCountdown( 10, new CountdownCallback( SendReadyGump ) );
StartCountdown( 10, SendReadyGump );
return;
}
@ -2417,7 +2417,7 @@ namespace Server.Engines.ConPVP
}
}
StartCountdown( 10, new CountdownCallback( SendReadyGump ) );
StartCountdown( 10, SendReadyGump );
return;
}
@ -2473,7 +2473,7 @@ namespace Server.Engines.ConPVP
m_EventGame?.OnStart();
StartCountdown( 10, new CountdownCallback( SendBeginGump ) );
StartCountdown( 10, SendBeginGump );
mg.Appear( m_GatePoint, m_GateFacet );
}
@ -2491,7 +2491,7 @@ namespace Server.Engines.ConPVP
}
}
StartCountdown( 10, new CountdownCallback( SendReadyGump ) );
StartCountdown( 10, SendReadyGump );
}
return;
@ -2529,7 +2529,7 @@ namespace Server.Engines.ConPVP
}
if ( count == -1 && isAllReady )
StartCountdown( 3, new CountdownCallback( SendReadyGump ) );
StartCountdown( 3, SendReadyGump );
}
public static void CloseAndSendGump( Mobile mob, Gump g, params Type[] types )

12
Scripts/Engines/ConPVP/Games/BombingRun.cs
View file

@ -105,7 +105,7 @@ namespace Server.Engines.ConPVP
}
}
Timer.DelayCall( TimeSpan.Zero, new TimerCallback( Delete ) ).Start(); // delete this after the world loads
Timer.DelayCall( TimeSpan.Zero, Delete ).Start(); // delete this after the world loads
}
public override void Serialize(GenericWriter writer)
@ -249,7 +249,7 @@ namespace Server.Engines.ConPVP
// has to be delayed in case some other target canceled us...
if ( m_Resend )
Timer.DelayCall( TimeSpan.Zero, new TimerCallback( ResendBombTarget ) ).Start();
Timer.DelayCall( TimeSpan.Zero, ResendBombTarget ).Start();
}
private void ResendBombTarget()
@ -302,7 +302,7 @@ namespace Server.Engines.ConPVP
m_Path.Clear();
m_PathIdx = 0;
Timer.DelayCall( TimeSpan.FromSeconds( 0.05 ), new TimerCallback( ContinueFlight ) ).Start();
Timer.DelayCall( TimeSpan.FromSeconds( 0.05 ), ContinueFlight ).Start();
}
private bool CheckCatch( Mobile m, Point3D myLoc )
@ -661,7 +661,7 @@ namespace Server.Engines.ConPVP
if ( m_PathIdx > 0 && m_PathIdx - 1 < m_Path.Count )
DoAnim( GetWorldLocation(), m_Path[m_PathIdx - 1], Map );
Timer.DelayCall( TimeSpan.FromSeconds( 0.1 ), new TimerCallback( ContinueFlight ) ).Start();
Timer.DelayCall( TimeSpan.FromSeconds( 0.1 ), ContinueFlight ).Start();
}
else
{
@ -1544,7 +1544,7 @@ namespace Server.Engines.ConPVP
if ( m_Bomb != null && m_Controller != null )
{
if ( m_UnhideCallback == null )
m_UnhideCallback = new TimerCallback( UnhideBomb );
m_UnhideCallback = UnhideBomb;
m_Bomb.Visible = false;
m_Bomb.MoveToWorld( m_Controller.BombHome, m_Controller.Map );
Timer.DelayCall( TimeSpan.FromSeconds( Utility.RandomMinMax( 5, 15 ) ), m_UnhideCallback );
@ -1740,7 +1740,7 @@ namespace Server.Engines.ConPVP
m_Bomb = new BRBomb( this );
ReturnBomb();
m_FinishTimer = Timer.DelayCall( m_Controller.Duration, new TimerCallback( Finish_Callback ) );
m_FinishTimer = Timer.DelayCall( m_Controller.Duration, Finish_Callback );
}
private void Finish_Callback()

6
Scripts/Engines/ConPVP/Games/CTF.cs
View file

@ -260,7 +260,7 @@ namespace Server.Engines.ConPVP
if ( IsChildOf( from.Backpack ) )
{
from.BeginTarget( 1, false, TargetFlags.None, new TargetCallback( Flag_OnTarget ) );
from.BeginTarget( 1, false, TargetFlags.None, Flag_OnTarget );
}
else if ( !from.InRange( this, 1 ) || !from.InLOS( this ) )
{
@ -343,7 +343,7 @@ namespace Server.Engines.ConPVP
{
StopCountdown();
m_ReturnTimer = Timer.DelayCall( TimeSpan.FromSeconds( 1.0 ), TimeSpan.FromSeconds( 1.0 ), new TimerCallback( Countdown_OnTick ) );
m_ReturnTimer = Timer.DelayCall( TimeSpan.FromSeconds( 1.0 ), TimeSpan.FromSeconds( 1.0 ), Countdown_OnTick );
m_ReturnCount = returnCount;
}
@ -1110,7 +1110,7 @@ namespace Server.Engines.ConPVP
m_FinishTimer?.Stop();
m_FinishTimer = Timer.DelayCall( m_Controller.Duration, new TimerCallback( Finish_Callback ) );
m_FinishTimer = Timer.DelayCall( m_Controller.Duration, Finish_Callback );
}
private void Finish_Callback()

6
Scripts/Engines/ConPVP/Games/DoubleDom.cs
View file

@ -727,7 +727,7 @@ namespace Server.Engines.ConPVP
ApplyHues( m_Context.Participants[i] as Participant, m_Controller.TeamInfo[i % m_Controller.TeamInfo.Length].Color );
m_FinishTimer?.Stop();
m_FinishTimer = Timer.DelayCall( m_Controller.Duration, new TimerCallback( Finish_Callback ) );
m_FinishTimer = Timer.DelayCall( m_Controller.Duration, Finish_Callback );
}
private void Finish_Callback()
@ -961,7 +961,7 @@ namespace Server.Engines.ConPVP
if ( !wasDom && isDom )
{
m_CapStage = 0;
m_CaptureTimer = Timer.DelayCall( TimeSpan.Zero, TimeSpan.FromSeconds( 1.0 ), new TimerCallback( CaptureTick ) );
m_CaptureTimer = Timer.DelayCall( TimeSpan.Zero, TimeSpan.FromSeconds( 1.0 ), CaptureTick );
m_CaptureTimer.Start();
}
}
@ -1014,7 +1014,7 @@ namespace Server.Engines.ConPVP
m_Controller.PointB.SetUncapturableHue();
}
m_UncaptureTimer = Timer.DelayCall( TimeSpan.FromSeconds( 30.0 ), new TimerCallback( UncaptureTick ) );
m_UncaptureTimer = Timer.DelayCall( TimeSpan.FromSeconds( 30.0 ), UncaptureTick );
m_UncaptureTimer.Start();
}
}

4
Scripts/Engines/ConPVP/Games/KingOfTheHill.cs
View file

@ -1029,7 +1029,7 @@ namespace Server.Engines.ConPVP
mob.Frozen = false;
if (corpse != null && !corpse.Deleted)
Timer.DelayCall(TimeSpan.FromSeconds(30), new TimerCallback(corpse.Delete));
Timer.DelayCall(TimeSpan.FromSeconds(30), corpse.Delete);
}
public override bool OnDeath(Mobile mob, Container corpse)
@ -1106,7 +1106,7 @@ namespace Server.Engines.ConPVP
board.m_Game = this;
}
m_FinishTimer = Timer.DelayCall(m_Controller.Duration, new TimerCallback(Finish_Callback));
m_FinishTimer = Timer.DelayCall(m_Controller.Duration, Finish_Callback);
}
private void Finish_Callback()

12
Scripts/Engines/ConPVP/Tournament.cs
View file

@ -48,7 +48,7 @@ namespace Server.Engines.ConPVP
[Constructible]
public TournamentRegistrar()
{
Timer.DelayCall( TimeSpan.FromSeconds( 30.0 ), TimeSpan.FromSeconds( 30.0 ), new TimerCallback( Announce_Callback ) );
Timer.DelayCall( TimeSpan.FromSeconds( 30.0 ), TimeSpan.FromSeconds( 30.0 ), Announce_Callback );
}
private void Announce_Callback()
@ -128,7 +128,7 @@ namespace Server.Engines.ConPVP
}
}
Timer.DelayCall( TimeSpan.FromSeconds( 30.0 ), TimeSpan.FromSeconds( 30.0 ), new TimerCallback( Announce_Callback ) );
Timer.DelayCall( TimeSpan.FromSeconds( 30.0 ), TimeSpan.FromSeconds( 30.0 ), Announce_Callback );
}
}
@ -733,7 +733,7 @@ namespace Server.Engines.ConPVP
}
else if ( m_Players.Count < m_Tournament.PlayersPerParticipant )
{
m_From.BeginTarget( 12, false, TargetFlags.None, new TargetCallback( AddPlayer_OnTarget ) );
m_From.BeginTarget( 12, false, TargetFlags.None, AddPlayer_OnTarget );
m_From.SendGump( new ConfirmSignupGump( m_From, m_Registrar, m_Tournament, m_Players ) );
}
}
@ -1072,7 +1072,7 @@ namespace Server.Engines.ConPVP
y -= 3;
AddButton( 314, y, 247, 248, 1, GumpButtonType.Reply, 0 );
Timer.DelayCall( TimeSpan.FromSeconds( 15.0 ), new TimerCallback( AutoReject ) );
Timer.DelayCall( TimeSpan.FromSeconds( 15.0 ), AutoReject );
}
public void AutoReject()
@ -1575,7 +1575,7 @@ namespace Server.Engines.ConPVP
}
}
Timer.DelayCall( SliceInterval, SliceInterval, new TimerCallback( Slice ) );
Timer.DelayCall( SliceInterval, SliceInterval, Slice );
}
public Tournament()
@ -1590,7 +1590,7 @@ namespace Server.Engines.ConPVP
m_Arenas = new ArrayList();
m_SignupPeriod = TimeSpan.FromMinutes( 10.0 );
Timer.DelayCall( SliceInterval, SliceInterval, new TimerCallback( Slice ) );
Timer.DelayCall( SliceInterval, SliceInterval, Slice );
}
public void HandleTie( Arena arena, TournyMatch match, ArrayList remaining )