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

36
Scripts/Engines/BulkOrders/Rewards.cs
View file

@ -178,16 +178,16 @@ namespace Server.Engines.BulkOrders
public sealed class SmithRewardCalculator : RewardCalculator
{
#region Constructors
private static readonly ConstructCallback SturdyShovel = new ConstructCallback( CreateSturdyShovel );
private static readonly ConstructCallback SturdyPickaxe = new ConstructCallback( CreateSturdyPickaxe );
private static readonly ConstructCallback MiningGloves = new ConstructCallback( CreateMiningGloves );
private static readonly ConstructCallback GargoylesPickaxe = new ConstructCallback( CreateGargoylesPickaxe );
private static readonly ConstructCallback ProspectorsTool = new ConstructCallback( CreateProspectorsTool );
private static readonly ConstructCallback PowderOfTemperament = new ConstructCallback( CreatePowderOfTemperament );
private static readonly ConstructCallback RunicHammer = new ConstructCallback( CreateRunicHammer );
private static readonly ConstructCallback PowerScroll = new ConstructCallback( CreatePowerScroll );
private static readonly ConstructCallback ColoredAnvil = new ConstructCallback( CreateColoredAnvil );
private static readonly ConstructCallback AncientHammer = new ConstructCallback( CreateAncientHammer );
private static readonly ConstructCallback SturdyShovel = CreateSturdyShovel;
private static readonly ConstructCallback SturdyPickaxe = CreateSturdyPickaxe;
private static readonly ConstructCallback MiningGloves = CreateMiningGloves;
private static readonly ConstructCallback GargoylesPickaxe = CreateGargoylesPickaxe;
private static readonly ConstructCallback ProspectorsTool = CreateProspectorsTool;
private static readonly ConstructCallback PowderOfTemperament = CreatePowderOfTemperament;
private static readonly ConstructCallback RunicHammer = CreateRunicHammer;
private static readonly ConstructCallback PowerScroll = CreatePowerScroll;
private static readonly ConstructCallback ColoredAnvil = CreateColoredAnvil;
private static readonly ConstructCallback AncientHammer = CreateAncientHammer;
private static Item CreateSturdyShovel( int type )
{
@ -460,14 +460,14 @@ namespace Server.Engines.BulkOrders
public sealed class TailorRewardCalculator : RewardCalculator
{
#region Constructors
private static readonly ConstructCallback Cloth = new ConstructCallback( CreateCloth );
private static readonly ConstructCallback Sandals = new ConstructCallback( CreateSandals );
private static readonly ConstructCallback StretchedHide = new ConstructCallback( CreateStretchedHide );
private static readonly ConstructCallback RunicKit = new ConstructCallback( CreateRunicKit );
private static readonly ConstructCallback Tapestry = new ConstructCallback( CreateTapestry );
private static readonly ConstructCallback PowerScroll = new ConstructCallback( CreatePowerScroll );
private static readonly ConstructCallback BearRug = new ConstructCallback( CreateBearRug );
private static readonly ConstructCallback ClothingBlessDeed = new ConstructCallback( CreateCBD );
private static readonly ConstructCallback Cloth = CreateCloth;
private static readonly ConstructCallback Sandals = CreateSandals;
private static readonly ConstructCallback StretchedHide = CreateStretchedHide;
private static readonly ConstructCallback RunicKit = CreateRunicKit;
private static readonly ConstructCallback Tapestry = CreateTapestry;
private static readonly ConstructCallback PowerScroll = CreatePowerScroll;
private static readonly ConstructCallback BearRug = CreateBearRug;
private static readonly ConstructCallback ClothingBlessDeed = CreateCBD;
private static int[][] m_ClothHues = {
new[]{ 0x483, 0x48C, 0x488, 0x48A },

4
Scripts/Engines/CannedEvil/ChampionSpawn.cs
View file

@ -80,7 +80,7 @@ namespace Server.Engines.CannedEvil
m_DamageEntries = new Dictionary<Mobile, int>();
Timer.DelayCall( TimeSpan.Zero, new TimerCallback( SetInitialSpawnArea ) );
Timer.DelayCall( TimeSpan.Zero, SetInitialSpawnArea );
}
public void SetInitialSpawnArea()
@ -1179,7 +1179,7 @@ namespace Server.Engines.CannedEvil
}
}
Timer.DelayCall( TimeSpan.Zero, new TimerCallback( UpdateRegion ) );
Timer.DelayCall( TimeSpan.Zero, UpdateRegion );
}
}

4
Scripts/Engines/Chat/Chat.cs
View file

@ -17,8 +17,8 @@ namespace Server.Engines.Chat
public static void Initialize()
{
PacketHandlers.Register( 0xB5, 0x40, true, new OnPacketReceive( OpenChatWindowRequest ) );
PacketHandlers.Register( 0xB3, 0, true, new OnPacketReceive( ChatAction ) );
PacketHandlers.Register( 0xB5, 0x40, true, OpenChatWindowRequest );
PacketHandlers.Register( 0xB3, 0, true, ChatAction );
}
public static void SendCommandTo( Mobile to, ChatCommand type )

56
Scripts/Engines/Chat/ChatActionHandlers.cs
View file

@ -8,36 +8,36 @@ namespace Server.Engines.Chat
{
m_Handlers = new ChatActionHandler[0x100];
Register( 0x41, true, true, new OnChatAction( ChangeChannelPassword ) );
Register( 0x41, true, true, ChangeChannelPassword );
Register( 0x58, false, false, new OnChatAction( LeaveChat ) );
Register( 0x58, false, false, LeaveChat );
Register( 0x61, false, true, new OnChatAction( ChannelMessage ) );
Register( 0x62, false, false, new OnChatAction( JoinChannel ) );
Register( 0x63, false, false, new OnChatAction( JoinNewChannel ) );
Register( 0x64, true, true, new OnChatAction( RenameChannel ) );
Register( 0x65, false, false, new OnChatAction( PrivateMessage ) );
Register( 0x66, false, false, new OnChatAction( AddIgnore ) );
Register( 0x67, false, false, new OnChatAction( RemoveIgnore ) );
Register( 0x68, false, false, new OnChatAction( ToggleIgnore ) );
Register( 0x69, true, true, new OnChatAction( AddVoice ) );
Register( 0x6A, true, true, new OnChatAction( RemoveVoice ) );
Register( 0x6B, true, true, new OnChatAction( ToggleVoice ) );
Register( 0x6C, true, true, new OnChatAction( AddModerator ) );
Register( 0x6D, true, true, new OnChatAction( RemoveModerator ) );
Register( 0x6E, true, true, new OnChatAction( ToggleModerator ) );
Register( 0x6F, false, false, new OnChatAction( AllowPrivateMessages ) );
Register( 0x70, false, false, new OnChatAction( DisallowPrivateMessages ) );
Register( 0x71, false, false, new OnChatAction( TogglePrivateMessages ) );
Register( 0x72, false, false, new OnChatAction( ShowCharacterName ) );
Register( 0x73, false, false, new OnChatAction( HideCharacterName ) );
Register( 0x74, false, false, new OnChatAction( ToggleCharacterName ) );
Register( 0x75, false, false, new OnChatAction( QueryWhoIs ) );
Register( 0x76, true, true, new OnChatAction( Kick ) );
Register( 0x77, true, true, new OnChatAction( EnableDefaultVoice ) );
Register( 0x78, true, true, new OnChatAction( DisableDefaultVoice ) );
Register( 0x79, true, true, new OnChatAction( ToggleDefaultVoice ) );
Register( 0x7A, false, true, new OnChatAction( EmoteMessage ) );
Register( 0x61, false, true, ChannelMessage );
Register( 0x62, false, false, JoinChannel );
Register( 0x63, false, false, JoinNewChannel );
Register( 0x64, true, true, RenameChannel );
Register( 0x65, false, false, PrivateMessage );
Register( 0x66, false, false, AddIgnore );
Register( 0x67, false, false, RemoveIgnore );
Register( 0x68, false, false, ToggleIgnore );
Register( 0x69, true, true, AddVoice );
Register( 0x6A, true, true, RemoveVoice );
Register( 0x6B, true, true, ToggleVoice );
Register( 0x6C, true, true, AddModerator );
Register( 0x6D, true, true, RemoveModerator );
Register( 0x6E, true, true, ToggleModerator );
Register( 0x6F, false, false, AllowPrivateMessages );
Register( 0x70, false, false, DisallowPrivateMessages );
Register( 0x71, false, false, TogglePrivateMessages );
Register( 0x72, false, false, ShowCharacterName );
Register( 0x73, false, false, HideCharacterName );
Register( 0x74, false, false, ToggleCharacterName );
Register( 0x75, false, false, QueryWhoIs );
Register( 0x76, true, true, Kick );
Register( 0x77, true, true, EnableDefaultVoice );
Register( 0x78, true, true, DisableDefaultVoice );
Register( 0x79, true, true, ToggleDefaultVoice );
Register( 0x7A, false, true, EmoteMessage );
}
public static void Register( int actionID, bool requireModerator, bool requireConference, OnChatAction callback )

2
Scripts/Engines/Chat/Chatold.cs
View file

@ -4,7 +4,7 @@ namespace Server.Chat
{
public static void Initialize()
{
EventSink.ChatRequest += new ChatRequestEventHandler( EventSink_ChatRequest );
EventSink.ChatRequest += EventSink_ChatRequest;
}
private static void EventSink_ChatRequest( ChatRequestEventArgs e )

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 )

6
Scripts/Engines/Craft/Core/CraftItem.cs
View file

@ -723,7 +723,7 @@ namespace Server.Engines.Craft
if ( IsQuantityType( types ) )
index = ConsumeQuantity( ourPack, types, amounts );
else
index = ourPack.ConsumeTotalGrouped( types, amounts, true, new OnItemConsumed( OnResourceConsumed ), new CheckItemGroup( CheckHueGrouping ) );
index = ourPack.ConsumeTotalGrouped( types, amounts, true, OnResourceConsumed, CheckHueGrouping );
resHue = m_ResHue;
}
@ -744,7 +744,7 @@ namespace Server.Engines.Craft
if ( IsQuantityType( types ) )
index = ConsumeQuantity( ourPack, types, amounts );
else
index = ourPack.ConsumeTotalGrouped( types, amounts, true, new OnItemConsumed( OnResourceConsumed ), new CheckItemGroup( CheckHueGrouping ) );
index = ourPack.ConsumeTotalGrouped( types, amounts, true, OnResourceConsumed, CheckHueGrouping );
resHue = m_ResHue;
}
@ -768,7 +768,7 @@ namespace Server.Engines.Craft
{
for ( int i = 0; i < types.Length; i++ )
{
if ( ourPack.GetBestGroupAmount( types[i], true, new CheckItemGroup( CheckHueGrouping ) ) < amounts[i] )
if ( ourPack.GetBestGroupAmount( types[i], true, CheckHueGrouping ) < amounts[i] )
{
index = i;
break;

50
Scripts/Engines/Craft/Core/Recipes.cs
View file

@ -9,8 +9,8 @@ namespace Server.Engines.Craft
{
public static void Initialize()
{
CommandSystem.Register( "LearnAllRecipes", AccessLevel.GameMaster, new CommandEventHandler( LearnAllRecipes_OnCommand ) );
CommandSystem.Register( "ForgetAllRecipes", AccessLevel.GameMaster, new CommandEventHandler( ForgetAllRecipes_OnCommand ) );
CommandSystem.Register( "LearnAllRecipes", AccessLevel.GameMaster, LearnAllRecipes_OnCommand );
CommandSystem.Register( "ForgetAllRecipes", AccessLevel.GameMaster, ForgetAllRecipes_OnCommand );
}
[Usage( "LearnAllRecipes" )]
@ -20,22 +20,20 @@ namespace Server.Engines.Craft
Mobile m = e.Mobile;
m.SendMessage( "Target a player to teach them all of the recipies." );
m.BeginTarget( -1, false, Targeting.TargetFlags.None, new TargetCallback(
delegate( Mobile from, object targeted )
m.BeginTarget( -1, false, Targeting.TargetFlags.None, delegate( Mobile from, object targeted )
{
if ( targeted is PlayerMobile mobile )
{
if ( targeted is PlayerMobile mobile )
{
foreach( KeyValuePair<int, Recipe> kvp in m_Recipes )
mobile.AcquireRecipe( kvp.Key );
foreach( KeyValuePair<int, Recipe> kvp in m_Recipes )
mobile.AcquireRecipe( kvp.Key );
m.SendMessage( "You teach them all of the recipies." );
}
else
{
m.SendMessage( "That is not a player!" );
}
m.SendMessage( "You teach them all of the recipies." );
}
) );
else
{
m.SendMessage( "That is not a player!" );
}
} );
}
[Usage( "ForgetAllRecipes" )]
@ -45,21 +43,19 @@ namespace Server.Engines.Craft
Mobile m = e.Mobile;
m.SendMessage( "Target a player to have them forget all of the recipies they've learned." );
m.BeginTarget( -1, false, Targeting.TargetFlags.None, new TargetCallback(
delegate( Mobile from, object targeted )
m.BeginTarget( -1, false, Targeting.TargetFlags.None, delegate( Mobile from, object targeted )
{
if ( targeted is PlayerMobile mobile )
{
if ( targeted is PlayerMobile mobile )
{
mobile.ResetRecipes();
mobile.ResetRecipes();
m.SendMessage( "They forget all their recipies." );
}
else
{
m.SendMessage( "That is not a player!" );
}
m.SendMessage( "They forget all their recipies." );
}
) );
else
{
m.SendMessage( "That is not a player!" );
}
} );
}

4
Scripts/Engines/Doom/GauntletSpawner.cs
View file

@ -143,7 +143,7 @@ namespace Server.Engines.Doom
CreateRegion();
FullSpawn();
m_Timer = Timer.DelayCall( TimeSpan.FromSeconds( 1.0 ), TimeSpan.FromSeconds( 1.0 ), new TimerCallback( Slice ) );
m_Timer = Timer.DelayCall( TimeSpan.FromSeconds( 1.0 ), TimeSpan.FromSeconds( 1.0 ), Slice );
}
else
{
@ -459,7 +459,7 @@ namespace Server.Engines.Doom
public static void Initialize()
{
CommandSystem.Register( "GenGauntlet", AccessLevel.Administrator, new CommandEventHandler( GenGauntlet_OnCommand ) );
CommandSystem.Register( "GenGauntlet", AccessLevel.Administrator, GenGauntlet_OnCommand );
}
public static void CreateTeleporter( int xFrom, int yFrom, int xTo, int yTo )

4
Scripts/Engines/Doom/LeverPuzzle/LeverPuzzleController.cs
View file

@ -33,7 +33,7 @@ namespace Server.Engines.Doom
public static void Initialize()
{
CommandSystem.Register( "GenLeverPuzzle", AccessLevel.Administrator, new CommandEventHandler( GenLampPuzzle_OnCommand ) );
CommandSystem.Register( "GenLeverPuzzle", AccessLevel.Administrator, GenLampPuzzle_OnCommand );
}
[Usage( "GenLeverPuzzle" )]
@ -267,7 +267,7 @@ namespace Server.Engines.Doom
if ( (TheirKey=(ushort)(code|(TheirKey<<=4))) < 0x0FFF )
{
l_Timer = Timer.DelayCall( TimeSpan.FromSeconds( 30.0 ), new TimerCallback( ResetPuzzle ));
l_Timer = Timer.DelayCall( TimeSpan.FromSeconds( 30.0 ), ResetPuzzle);
return;
}

2
Scripts/Engines/Doom/LeverPuzzle/LeverPuzzleItems.cs
View file

@ -29,7 +29,7 @@ namespace Server.Engines.Doom
m_Wanderer = new WandererOfTheVoid();
m_Wanderer.MoveToWorld( LeverPuzzleController.lr_Enter, Map.Malas );
m_Wanderer.PublicOverheadMessage( MessageType.Regular, 0x3B2, 1060002, "" ); // I am the guardian of...
Timer.DelayCall( TimeSpan.FromSeconds( 5.0 ), new TimerCallback( CallBackMessage ) );
Timer.DelayCall( TimeSpan.FromSeconds( 5.0 ), CallBackMessage );
}
}

2
Scripts/Engines/Doom/LeverPuzzle/LeverPuzzleRegions.cs
View file

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

4
Scripts/Engines/Ethics/Core/Ethic.cs
View file

@ -83,7 +83,7 @@ namespace Server.Ethics
public static void Initialize()
{
if ( Enabled )
EventSink.Speech += new SpeechEventHandler( EventSink_Speech );
EventSink.Speech += EventSink_Speech;
}
public static void EventSink_Speech( SpeechEventArgs e )
@ -215,7 +215,7 @@ namespace Server.Ethics
Player pl = new Player( this, reader );
if ( pl.Mobile != null )
Timer.DelayCall( TimeSpan.Zero, new TimerCallback( pl.CheckAttach ) );
Timer.DelayCall( TimeSpan.Zero, pl.CheckAttach );
}
break;

2
Scripts/Engines/Factions/Core/Election.cs
View file

@ -73,7 +73,7 @@ namespace Server.Factions
public void StartTimer()
{
m_Timer = Timer.DelayCall( TimeSpan.FromMinutes( 1.0 ), TimeSpan.FromMinutes( 1.0 ), new TimerCallback( Slice ) );
m_Timer = Timer.DelayCall( TimeSpan.FromMinutes( 1.0 ), TimeSpan.FromMinutes( 1.0 ), Slice );
}
public Election( Faction faction )

26
Scripts/Engines/Factions/Core/Faction.cs
View file

@ -189,7 +189,7 @@ namespace Server.Factions
public void BeginHonorLeadership( Mobile from )
{
from.SendLocalizedMessage( 502090 ); // Click on the player whom you wish to honor.
from.BeginTarget( 12, false, TargetFlags.None, new TargetCallback( HonorLeadership_OnTarget ) );
from.BeginTarget( 12, false, TargetFlags.None, HonorLeadership_OnTarget );
}
public void HonorLeadership_OnTarget( Mobile from, object obj )
@ -546,18 +546,18 @@ namespace Server.Factions
public static void Initialize()
{
EventSink.Login += new LoginEventHandler( EventSink_Login );
EventSink.Logout += new LogoutEventHandler( EventSink_Logout );
EventSink.Login += EventSink_Login;
EventSink.Logout += EventSink_Logout;
Timer.DelayCall( TimeSpan.FromMinutes( 1.0 ), TimeSpan.FromMinutes( 10.0 ), new TimerCallback( HandleAtrophy ) );
Timer.DelayCall( TimeSpan.FromMinutes( 1.0 ), TimeSpan.FromMinutes( 10.0 ), HandleAtrophy );
Timer.DelayCall( TimeSpan.FromSeconds( 30.0 ), TimeSpan.FromSeconds( 30.0 ), new TimerCallback( ProcessTick ) );
Timer.DelayCall( TimeSpan.FromSeconds( 30.0 ), TimeSpan.FromSeconds( 30.0 ), ProcessTick );
CommandSystem.Register( "FactionElection", AccessLevel.GameMaster, new CommandEventHandler( FactionElection_OnCommand ) );
CommandSystem.Register( "FactionCommander", AccessLevel.Administrator, new CommandEventHandler( FactionCommander_OnCommand ) );
CommandSystem.Register( "FactionItemReset", AccessLevel.Administrator, new CommandEventHandler( FactionItemReset_OnCommand ) );
CommandSystem.Register( "FactionReset", AccessLevel.Administrator, new CommandEventHandler( FactionReset_OnCommand ) );
CommandSystem.Register( "FactionTownReset", AccessLevel.Administrator, new CommandEventHandler( FactionTownReset_OnCommand ) );
CommandSystem.Register( "FactionElection", AccessLevel.GameMaster, FactionElection_OnCommand );
CommandSystem.Register( "FactionCommander", AccessLevel.Administrator, FactionCommander_OnCommand );
CommandSystem.Register( "FactionItemReset", AccessLevel.Administrator, FactionItemReset_OnCommand );
CommandSystem.Register( "FactionReset", AccessLevel.Administrator, FactionReset_OnCommand );
CommandSystem.Register( "FactionTownReset", AccessLevel.Administrator, FactionTownReset_OnCommand );
}
public static void FactionTownReset_OnCommand( CommandEventArgs e )
@ -726,7 +726,7 @@ namespace Server.Factions
public static void FactionCommander_OnCommand( CommandEventArgs e )
{
e.Mobile.SendMessage( "Target a player to make them the faction commander." );
e.Mobile.BeginTarget( -1, false, TargetFlags.None, new TargetCallback( FactionCommander_OnTarget ) );
e.Mobile.BeginTarget( -1, false, TargetFlags.None, FactionCommander_OnTarget );
}
public static void FactionCommander_OnTarget( Mobile from, object obj )
@ -755,7 +755,7 @@ namespace Server.Factions
public static void FactionElection_OnCommand( CommandEventArgs e )
{
e.Mobile.SendMessage( "Target a faction stone to open its election properties." );
e.Mobile.BeginTarget( -1, false, TargetFlags.None, new TargetCallback( FactionElection_OnTarget ) );
e.Mobile.BeginTarget( -1, false, TargetFlags.None, FactionElection_OnTarget );
}
public static void FactionElection_OnTarget( Mobile from, object obj )
@ -779,7 +779,7 @@ namespace Server.Factions
public static void FactionKick_OnCommand( CommandEventArgs e )
{
e.Mobile.SendMessage( "Target a player to remove them from their faction." );
e.Mobile.BeginTarget( -1, false, TargetFlags.None, new TargetCallback( FactionKick_OnTarget ) );
e.Mobile.BeginTarget( -1, false, TargetFlags.None, FactionKick_OnTarget );
}
public static void FactionKick_OnTarget( Mobile from, object obj )

2
Scripts/Engines/Factions/Core/FactionState.cs
View file

@ -243,7 +243,7 @@ namespace Server.Factions
{
FactionItem factionItem = new FactionItem( reader, m_Faction );
Timer.DelayCall( TimeSpan.Zero, new TimerCallback( factionItem.CheckAttach ) ); // sandbox attachment
Timer.DelayCall( TimeSpan.Zero, factionItem.CheckAttach ); // sandbox attachment
}
}

2
Scripts/Engines/Factions/Core/Generator.cs
View file

@ -8,7 +8,7 @@ namespace Server.Factions
{
public static void Initialize()
{
CommandSystem.Register( "GenerateFactions", AccessLevel.Administrator, new CommandEventHandler( GenerateFactions_OnCommand ) );
CommandSystem.Register( "GenerateFactions", AccessLevel.Administrator, GenerateFactions_OnCommand );
}
public static void GenerateFactions_OnCommand( CommandEventArgs e )

2
Scripts/Engines/Factions/Core/Keywords.cs
View file

@ -8,7 +8,7 @@ namespace Server.Factions
{
public static void Initialize()
{
EventSink.Speech += new SpeechEventHandler( EventSink_Speech );
EventSink.Speech += EventSink_Speech;
}
private static void ShowScore_Sandbox( object state )

6
Scripts/Engines/Factions/Core/Town.cs
View file

@ -152,7 +152,7 @@ namespace Server.Factions
type = "guard";
from.SendMessage( "Target the {0} you wish to dismiss.", type );
from.BeginTarget( 12, false, TargetFlags.None, new TargetCallback( EndOrderFiring ) );
from.BeginTarget( 12, false, TargetFlags.None, EndOrderFiring );
}
public void EndOrderFiring( Mobile from, object obj )
@ -184,7 +184,7 @@ namespace Server.Factions
{
m_IncomeTimer?.Stop();
m_IncomeTimer = Timer.DelayCall( TimeSpan.FromMinutes( 1.0 ), TimeSpan.FromMinutes( 1.0 ), new TimerCallback( CheckIncome ) );
m_IncomeTimer = Timer.DelayCall( TimeSpan.FromMinutes( 1.0 ), TimeSpan.FromMinutes( 1.0 ), CheckIncome );
}
public void StopIncomeTimer()
@ -381,7 +381,7 @@ namespace Server.Factions
towns[i].Finance = towns[i].Finance;
}
CommandSystem.Register( "GrantTownSilver", AccessLevel.Administrator, new CommandEventHandler( GrantTownSilver_OnCommand ) );
CommandSystem.Register( "GrantTownSilver", AccessLevel.Administrator, GrantTownSilver_OnCommand );
}
public Town()

4
Scripts/Engines/Factions/Gumps/TownStoneGump.cs
View file

@ -59,7 +59,7 @@ namespace Server.Factions
else
{
m_From.SendLocalizedMessage( 1010347 ); // Who shall be your new sheriff
m_From.BeginTarget( 12, false, TargetFlags.None, new TargetCallback( HireSheriff_OnTarget ) );
m_From.BeginTarget( 12, false, TargetFlags.None, HireSheriff_OnTarget );
}
break;
@ -73,7 +73,7 @@ namespace Server.Factions
else
{
m_From.SendLocalizedMessage( 1010348 ); // Who shall be your new Minister of Finances?
m_From.BeginTarget( 12, false, TargetFlags.None, new TargetCallback( HireFinanceMinister_OnTarget ) );
m_From.BeginTarget( 12, false, TargetFlags.None, HireFinanceMinister_OnTarget );
}
break;

2
Scripts/Engines/Factions/Items/Sigil.cs
View file

@ -205,7 +205,7 @@ namespace Server.Factions
{
if ( IsChildOf( from.Backpack ) )
{
from.BeginTarget( 1, false, Targeting.TargetFlags.None, new TargetCallback( Sigil_OnTarget ) );
from.BeginTarget( 1, false, Targeting.TargetFlags.None, Sigil_OnTarget );
from.SendLocalizedMessage( 1042251 ); // Click on a sigil monolith or player
}
}

4
Scripts/Engines/Factions/Items/Traps/BaseFactionTrap.cs
View file

@ -199,7 +199,7 @@ namespace Server.Factions
if ( (m_TimeOfPlacement + decayPeriod) < DateTime.UtcNow )
{
Timer.DelayCall( TimeSpan.Zero, new TimerCallback( Delete ) );
Timer.DelayCall( TimeSpan.Zero, Delete );
return true;
}
@ -210,7 +210,7 @@ namespace Server.Factions
{
m_Concealing?.Stop();
m_Concealing = Timer.DelayCall( ConcealPeriod, new TimerCallback( Conceal ) );
m_Concealing = Timer.DelayCall( ConcealPeriod, Conceal );
}
public virtual void Conceal()

2
Scripts/Engines/Factions/Mobiles/Guards/BaseFactionGuard.cs
View file

@ -423,7 +423,7 @@ namespace Server.Factions
m_Town = Town.ReadReference( reader );
m_Orders = new Orders( this, reader );
Timer.DelayCall( TimeSpan.Zero, new TimerCallback( Register ) );
Timer.DelayCall( TimeSpan.Zero, Register );
}
}

2
Scripts/Engines/Help/HelpGump.cs
View file

@ -49,7 +49,7 @@ namespace Server.Engines.Help
{
public static void Initialize()
{
EventSink.HelpRequest += new HelpRequestEventHandler( EventSink_HelpRequest );
EventSink.HelpRequest += EventSink_HelpRequest;
}
private static void EventSink_HelpRequest( HelpRequestEventArgs e )

2
Scripts/Engines/Help/PageQueue.cs
View file

@ -157,7 +157,7 @@ namespace Server.Engines.Help
public static void Initialize()
{
CommandSystem.Register( "Pages", AccessLevel.Counselor, new CommandEventHandler( Pages_OnCommand ) );
CommandSystem.Register( "Pages", AccessLevel.Counselor, Pages_OnCommand );
}
public static bool CheckAllowedToPage( Mobile from )

2
Scripts/Engines/Help/SpeechLog.cs
View file

@ -21,7 +21,7 @@ namespace Server.Engines.Help
public static void Initialize()
{
CommandSystem.Register( "SpeechLog", AccessLevel.Counselor, new CommandEventHandler( SpeechLog_OnCommand ) );
CommandSystem.Register( "SpeechLog", AccessLevel.Counselor, SpeechLog_OnCommand );
}
[Usage( "SpeechLog" )]

2
Scripts/Engines/Khaldun/KhaldunGen.cs
View file

@ -9,7 +9,7 @@ namespace Server.Commands
public static void Initialize()
{
CommandSystem.Register( "GenKhaldun", AccessLevel.Administrator, new CommandEventHandler( GenKhaldun_OnCommand ) );
CommandSystem.Register( "GenKhaldun", AccessLevel.Administrator, GenKhaldun_OnCommand );
}
public static bool FindMorphItem( int x, int y, int z, int inactiveItemID, int activeItemID )

2
Scripts/Engines/Khaldun/RaisableItem.cs
View file

@ -115,7 +115,7 @@ namespace Server.Items
m_Step = 0;
TimeSpan delay = m_CloseTime - DateTime.UtcNow;
DelayCall( delay > TimeSpan.Zero ? delay : TimeSpan.Zero, new TimerCallback( Start ) );
DelayCall( delay > TimeSpan.Zero ? delay : TimeSpan.Zero, Start );
return;
}

2
Scripts/Engines/Khaldun/RaiseSwitch.cs
View file

@ -216,7 +216,7 @@ namespace Server.Items
int version = reader.ReadEncodedInt();
Timer.DelayCall( TimeSpan.Zero, new TimerCallback( Refresh ) );
Timer.DelayCall( TimeSpan.Zero, Refresh );
}
}
}

4
Scripts/Engines/MLQuests/Gumps/RaceChangeGump.cs
View file

@ -71,7 +71,7 @@ namespace Server.Engines.MLQuests.Gumps
private class RaceChangeState
{
private static readonly TimeSpan m_TimeoutDelay = TimeSpan.FromMinutes( 1 );
private static readonly TimerStateCallback<NetState> m_TimeoutCallback = new TimerStateCallback<NetState>( Timeout );
private static readonly TimerStateCallback<NetState> m_TimeoutCallback = Timeout;
public IRaceChanger m_Owner;
public Race m_TargetRace;
@ -91,7 +91,7 @@ namespace Server.Engines.MLQuests.Gumps
{
m_Pending = new Dictionary<NetState, RaceChangeState>();
PacketHandlers.RegisterExtended( 0x2A, true, new OnPacketReceive( RaceChangeReply ) );
PacketHandlers.RegisterExtended( 0x2A, true, RaceChangeReply );
}
public static bool IsPending( NetState state )

10
Scripts/Engines/MLQuests/MLQuestSystem.cs
View file

@ -138,15 +138,15 @@ namespace Server.Engines.MLQuests
MLQuestPersistence.EnsureExistence();
CommandSystem.Register( "MLQuestsInfo", AccessLevel.Administrator, new CommandEventHandler( MLQuestsInfo_OnCommand ) );
CommandSystem.Register( "SaveQuest", AccessLevel.Administrator, new CommandEventHandler( SaveQuest_OnCommand ) );
CommandSystem.Register( "SaveAllQuests", AccessLevel.Administrator, new CommandEventHandler( SaveAllQuests_OnCommand ) );
CommandSystem.Register( "InvalidQuestItems", AccessLevel.Administrator, new CommandEventHandler( InvalidQuestItems_OnCommand ) );
CommandSystem.Register( "MLQuestsInfo", AccessLevel.Administrator, MLQuestsInfo_OnCommand );
CommandSystem.Register( "SaveQuest", AccessLevel.Administrator, SaveQuest_OnCommand );
CommandSystem.Register( "SaveAllQuests", AccessLevel.Administrator, SaveAllQuests_OnCommand );
CommandSystem.Register( "InvalidQuestItems", AccessLevel.Administrator, InvalidQuestItems_OnCommand );
TargetCommands.Register( new ViewQuestsCommand() );
TargetCommands.Register( new ViewContextCommand() );
EventSink.QuestGumpRequest += new QuestGumpRequestHandler( EventSink_QuestGumpRequest );
EventSink.QuestGumpRequest += EventSink_QuestGumpRequest;
}
[Usage( "MLQuestsInfo" )]

2
Scripts/Engines/MLQuests/Objectives/EscortObjective.cs
View file

@ -106,7 +106,7 @@ namespace Server.Engines.MLQuests.Objectives
{
m_Objective = objective;
m_HasCompleted = false;
m_Timer = Timer.DelayCall( TimeSpan.FromSeconds( 5 ), TimeSpan.FromSeconds( 5 ), new TimerCallback( CheckDestination ) );
m_Timer = Timer.DelayCall( TimeSpan.FromSeconds( 5 ), TimeSpan.FromSeconds( 5 ), CheckDestination );
m_LastSeenEscorter = DateTime.UtcNow;
m_Escort = instance.Quester as BaseCreature;

2
Scripts/Engines/MyRunUO/DatabaseCommandQueue.cs
View file

@ -49,7 +49,7 @@ namespace Server.Engines.MyRunUO
m_Sync = new ManualResetEvent( true );
m_Thread = new Thread( new ThreadStart( Thread_Start ) );
m_Thread = new Thread( Thread_Start );
m_Thread.Name = threadName;//"MyRunUO Database Command Queue";
m_Thread.Priority = Config.DatabaseThreadPriority;
m_Thread.Start();

10
Scripts/Engines/MyRunUO/MyRunUO.cs
View file

@ -20,13 +20,13 @@ namespace Server.Engines.MyRunUO
{
if ( Config.Enabled )
{
DelayCall( TimeSpan.FromSeconds( 10.0 ), Config.CharacterUpdateInterval, new TimerCallback( Begin ) );
DelayCall( TimeSpan.FromSeconds( 10.0 ), Config.CharacterUpdateInterval, Begin );
CommandSystem.Register( "InitMyRunUO", AccessLevel.Administrator, new CommandEventHandler( InitMyRunUO_OnCommand ) );
CommandSystem.Register( "UpdateMyRunUO", AccessLevel.Administrator, new CommandEventHandler( UpdateMyRunUO_OnCommand ) );
CommandSystem.Register( "InitMyRunUO", AccessLevel.Administrator, InitMyRunUO_OnCommand );
CommandSystem.Register( "UpdateMyRunUO", AccessLevel.Administrator, UpdateMyRunUO_OnCommand );
CommandSystem.Register( "PublicChar", AccessLevel.Player, new CommandEventHandler( PublicChar_OnCommand ) );
CommandSystem.Register( "PrivateChar", AccessLevel.Player, new CommandEventHandler( PrivateChar_OnCommand ) );
CommandSystem.Register( "PublicChar", AccessLevel.Player, PublicChar_OnCommand );
CommandSystem.Register( "PrivateChar", AccessLevel.Player, PrivateChar_OnCommand );
}
}

4
Scripts/Engines/MyRunUO/MyRunUOStatus.cs
View file

@ -11,9 +11,9 @@ namespace Server.Engines.MyRunUO
{
if ( Config.Enabled )
{
Timer.DelayCall( TimeSpan.FromSeconds( 20.0 ), Config.StatusUpdateInterval, new TimerCallback( Begin ) );
Timer.DelayCall( TimeSpan.FromSeconds( 20.0 ), Config.StatusUpdateInterval, Begin );
CommandSystem.Register( "UpdateWebStatus", AccessLevel.Administrator, new CommandEventHandler( UpdateWebStatus_OnCommand ) );
CommandSystem.Register( "UpdateWebStatus", AccessLevel.Administrator, UpdateWebStatus_OnCommand );
}
}

10
Scripts/Engines/Party/Party.cs
View file

@ -18,16 +18,16 @@ namespace Server.Engines.PartySystem
public static void Initialize()
{
EventSink.Logout += new LogoutEventHandler( EventSink_Logout );
EventSink.Login += new LoginEventHandler( EventSink_Login );
EventSink.PlayerDeath += new PlayerDeathEventHandler( EventSink_PlayerDeath );
EventSink.Logout += EventSink_Logout;
EventSink.Login += EventSink_Login;
EventSink.PlayerDeath += EventSink_PlayerDeath;
CommandSystem.Register( "ListenToParty", AccessLevel.GameMaster, new CommandEventHandler( ListenToParty_OnCommand ) );
CommandSystem.Register( "ListenToParty", AccessLevel.GameMaster, ListenToParty_OnCommand );
}
public static void ListenToParty_OnCommand( CommandEventArgs e )
{
e.Mobile.BeginTarget( -1, false, TargetFlags.None, new TargetCallback( ListenToParty_OnTarget ) );
e.Mobile.BeginTarget( -1, false, TargetFlags.None, ListenToParty_OnTarget );
e.Mobile.SendMessage( "Target a partied player." );
}

4
Scripts/Engines/Pathing/MovementPath.cs
View file

@ -22,12 +22,12 @@ namespace Server
public static void Initialize()
{
CommandSystem.Register( "Path", AccessLevel.GameMaster, new CommandEventHandler( Path_OnCommand ) );
CommandSystem.Register( "Path", AccessLevel.GameMaster, Path_OnCommand );
}
public static void Path_OnCommand( CommandEventArgs e )
{
e.Mobile.BeginTarget( -1, true, TargetFlags.None, new TargetCallback( Path_OnTarget ) );
e.Mobile.BeginTarget( -1, true, TargetFlags.None, Path_OnTarget );
e.Mobile.SendMessage( "Target a location and a path will be drawn there." );
}

6
Scripts/Engines/Plants/PlantSystem.cs
View file

@ -367,12 +367,12 @@ namespace Server.Engines.Plants
public static void Configure()
{
EventSink.WorldLoad += new WorldLoadEventHandler( EventSink_WorldLoad );
EventSink.WorldLoad += EventSink_WorldLoad;
if ( !Misc.AutoRestart.Enabled )
EventSink.WorldSave += new WorldSaveEventHandler( EventSink_WorldSave );
EventSink.WorldSave += EventSink_WorldSave;
EventSink.Login += new LoginEventHandler( EventSink_Login );
EventSink.Login += EventSink_Login;
}
private static void EventSink_Login( LoginEventArgs args )

2
Scripts/Engines/Quests/Core/Items/HornOfRetreat.cs
View file

@ -158,7 +158,7 @@ namespace Server.Engines.Quests
Dispellable = false;
Timer.DelayCall( TimeSpan.FromSeconds( 10.0 ), new TimerCallback( Delete ) );
Timer.DelayCall( TimeSpan.FromSeconds( 10.0 ), Delete );
}
public override void BeginConfirmation( Mobile from )

8
Scripts/Engines/Quests/Core/QuestSystem.cs
View file

@ -66,7 +66,7 @@ namespace Server.Engines.Quests
if ( m_Timer != null )
return;
m_Timer = Timer.DelayCall( TimeSpan.FromSeconds( 0.5 ), TimeSpan.FromSeconds( 0.5 ), new TimerCallback( Slice ) );
m_Timer = Timer.DelayCall( TimeSpan.FromSeconds( 0.5 ), TimeSpan.FromSeconds( 0.5 ), Slice );
}
public virtual void StopTimer()
@ -226,12 +226,12 @@ namespace Server.Engines.Quests
public virtual void GetContextMenuEntries( List<ContextMenuEntry> list )
{
if ( m_Objectives.Count > 0 )
list.Add( new QuestCallbackEntry( 6154, new QuestCallback( ShowQuestLog ) ) ); // View Quest Log
list.Add( new QuestCallbackEntry( 6154, ShowQuestLog ) ); // View Quest Log
if ( m_Conversations.Count > 0 )
list.Add( new QuestCallbackEntry( 6156, new QuestCallback( ShowQuestConversation ) ) ); // Quest Conversation
list.Add( new QuestCallbackEntry( 6156, ShowQuestConversation ) ); // Quest Conversation
list.Add( new QuestCallbackEntry( 6155, new QuestCallback( BeginCancelQuest ) ) ); // Cancel Quest
list.Add( new QuestCallbackEntry( 6155, BeginCancelQuest ) ); // Cancel Quest
}
public virtual void ShowQuestLogUpdated()

4
Scripts/Engines/Quests/Dark Tides/Items/MaabusCoffin.cs
View file

@ -45,7 +45,7 @@ namespace Server.Engines.Quests.Necro
m_Maabus.Direction = m_Maabus.GetDirectionTo( caller );
Timer.DelayCall( TimeSpan.FromSeconds( 7.5 ), new TimerCallback( BeginSleep ) );
Timer.DelayCall( TimeSpan.FromSeconds( 7.5 ), BeginSleep );
}
public void BeginSleep()
@ -55,7 +55,7 @@ namespace Server.Engines.Quests.Necro
Effects.PlaySound( m_Maabus.Location, m_Maabus.Map, 0x48E );
Timer.DelayCall( TimeSpan.FromSeconds( 2.5 ), new TimerCallback( Sleep ) );
Timer.DelayCall( TimeSpan.FromSeconds( 2.5 ), Sleep );
}
public void Sleep()

4
Scripts/Engines/Quests/Dark Tides/Mobiles/SummonedPaladin.cs
View file

@ -81,7 +81,7 @@ namespace Server.Engines.Quests.Necro
m_ToDelete = true;
Timer.DelayCall( TimeSpan.FromSeconds( 5.0 ), new TimerCallback( Delete ) );
Timer.DelayCall( TimeSpan.FromSeconds( 5.0 ), Delete );
}
else if ( m_Necromancer.Map != Map || GetDistanceToSqrt( m_Necromancer ) > RangePerception + 1 )
{
@ -214,7 +214,7 @@ namespace Server.Engines.Quests.Necro
Hue = 0x482;
Light = LightType.Circle300;
Timer.DelayCall( TimeSpan.FromSeconds( 10.0 ), new TimerCallback( Delete ) );
Timer.DelayCall( TimeSpan.FromSeconds( 10.0 ), Delete );
}
public SummonedPaladinMoongate( Serial serial ) : base( serial )

4
Scripts/Engines/Quests/Haochi's Trials/Items/HaochisTreasureChest.cs
View file

@ -74,7 +74,7 @@ namespace Server.Engines.Quests.Samurai
obj.StolenTreasure = true;
}
Timer.DelayCall( TimeSpan.FromMinutes( 2.0 ), new TimerCallback( GenerateTreasure ) );
Timer.DelayCall( TimeSpan.FromMinutes( 2.0 ), GenerateTreasure );
}
public override void Serialize( GenericWriter writer )
@ -90,7 +90,7 @@ namespace Server.Engines.Quests.Samurai
int version = reader.ReadEncodedInt();
Timer.DelayCall( TimeSpan.Zero, new TimerCallback( GenerateTreasure ) );
Timer.DelayCall( TimeSpan.Zero, GenerateTreasure );
}
}
}

6
Scripts/Engines/Quests/The Summoning/Mobiles/Chyloth.cs
View file

@ -54,7 +54,7 @@ namespace Server.Engines.Quests.Doom
if ( Deleted || m_AngryAt == null )
return;
Timer.DelayCall( TimeSpan.FromSeconds( 4.0 ), new TimerCallback( EndGiveWarning ) );
Timer.DelayCall( TimeSpan.FromSeconds( 4.0 ), EndGiveWarning );
}
public virtual void EndGiveWarning()
@ -73,12 +73,12 @@ namespace Server.Engines.Quests.Doom
if ( Deleted || m_AngryAt == null )
return;
Timer.DelayCall( TimeSpan.FromSeconds( 30.0 ), new TimerCallback( EndSummonDragon ) );
Timer.DelayCall( TimeSpan.FromSeconds( 30.0 ), EndSummonDragon );
}
public virtual void BeginRemove( TimeSpan delay )
{
Timer.DelayCall( delay, new TimerCallback( EndRemove ) );
Timer.DelayCall( delay, EndRemove );
}
public virtual void EndRemove()

2
Scripts/Engines/Quests/Witch Apprentice/Mobiles/Blackheart.cs
View file

@ -92,7 +92,7 @@ namespace Server.Engines.Quests.Hag
{
PublicOverheadMessage( Network.MessageType.Regular, 0x3B2, 500849 ); // *hic*
Timer.DelayCall( TimeSpan.FromSeconds( Utility.RandomMinMax( 60, 180 ) ), new TimerCallback( Heave ) );
Timer.DelayCall( TimeSpan.FromSeconds( Utility.RandomMinMax( 60, 180 ) ), Heave );
}
public override void Serialize( GenericWriter writer )

6
Scripts/Engines/RemoteAdmin/Network.cs
View file

@ -18,12 +18,12 @@ namespace Server.RemoteAdmin
public static void Configure()
{
PacketHandlers.Register( 0xF1, 0, false, new OnPacketReceive( OnReceive ) );
PacketHandlers.Register( 0xF1, 0, false, OnReceive );
#if !MONO
Core.MultiConsoleOut.Add( new EventTextWriter( new EventTextWriter.OnConsoleChar( OnConsoleChar ), new EventTextWriter.OnConsoleLine( OnConsoleLine ), new EventTextWriter.OnConsoleStr( OnConsoleString ) ) );
Core.MultiConsoleOut.Add( new EventTextWriter( OnConsoleChar, OnConsoleLine, OnConsoleString ) );
#endif
Timer.DelayCall( TimeSpan.FromMinutes( 2.5 ), TimeSpan.FromMinutes( 2.5 ), new TimerCallback( CleanUp ) );
Timer.DelayCall( TimeSpan.FromMinutes( 2.5 ), TimeSpan.FromMinutes( 2.5 ), CleanUp );
}
public static void OnConsoleString( string str )

8
Scripts/Engines/RemoteAdmin/PacketHandlers.cs
View file

@ -18,10 +18,10 @@ namespace Server.RemoteAdmin
static RemoteAdminHandlers()
{
//0x02 = login request, handled by AdminNetwork
Register( 0x04, new OnPacketReceive( ServerInfoRequest ) );
Register( 0x05, new OnPacketReceive( AccountSearch ) );
Register( 0x06, new OnPacketReceive( RemoveAccount ) );
Register( 0x07, new OnPacketReceive( UpdateAccount ) );
Register( 0x04, ServerInfoRequest );
Register( 0x05, AccountSearch );
Register( 0x06, RemoveAccount );
Register( 0x07, UpdateAccount );
}
public static void Register( byte command, OnPacketReceive handler )

2
Scripts/Engines/Reports/Objects/Charts/BarGraph.cs
View file

@ -12,7 +12,7 @@ namespace Server.Engines.Reports
public class BarGraph : Chart
{
#region Type Identification
public static readonly PersistableType ThisTypeID = new PersistableType( "bg", new ConstructCallback( Construct ) );
public static readonly PersistableType ThisTypeID = new PersistableType( "bg", Construct );
private static PersistableObject Construct()
{

2
Scripts/Engines/Reports/Objects/Charts/ChartItem.cs
View file

@ -3,7 +3,7 @@ namespace Server.Engines.Reports
public class ChartItem : PersistableObject
{
#region Type Identification
public static readonly PersistableType ThisTypeID = new PersistableType( "ci", new ConstructCallback( Construct ) );
public static readonly PersistableType ThisTypeID = new PersistableType( "ci", Construct );
private static PersistableObject Construct()
{

2
Scripts/Engines/Reports/Objects/Charts/PieChart.cs
View file

@ -3,7 +3,7 @@ namespace Server.Engines.Reports
public class PieChart : Chart
{
#region Type Identification
public static readonly PersistableType ThisTypeID = new PersistableType( "pc", new ConstructCallback( Construct ) );
public static readonly PersistableType ThisTypeID = new PersistableType( "pc", Construct );
private static PersistableObject Construct()
{

2
Scripts/Engines/Reports/Objects/Reports/ItemValue.cs
View file

@ -3,7 +3,7 @@ namespace Server.Engines.Reports
public class ItemValue : PersistableObject
{
#region Type Identification
public static readonly PersistableType ThisTypeID = new PersistableType( "iv", new ConstructCallback( Construct ) );
public static readonly PersistableType ThisTypeID = new PersistableType( "iv", Construct );
private static PersistableObject Construct()
{

2
Scripts/Engines/Reports/Objects/Reports/Report.cs
View file

@ -3,7 +3,7 @@ namespace Server.Engines.Reports
public class Report : PersistableObject
{
#region Type Identification
public static readonly PersistableType ThisTypeID = new PersistableType( "rp", new ConstructCallback( Construct ) );
public static readonly PersistableType ThisTypeID = new PersistableType( "rp", Construct );
private static PersistableObject Construct()
{

2
Scripts/Engines/Reports/Objects/Reports/ReportColumn.cs
View file

@ -3,7 +3,7 @@ namespace Server.Engines.Reports
public class ReportColumn : PersistableObject
{
#region Type Identification
public static readonly PersistableType ThisTypeID = new PersistableType( "rc", new ConstructCallback( Construct ) );
public static readonly PersistableType ThisTypeID = new PersistableType( "rc", Construct );
private static PersistableObject Construct()
{

2
Scripts/Engines/Reports/Objects/Reports/ReportItem.cs
View file

@ -3,7 +3,7 @@ namespace Server.Engines.Reports
public class ReportItem : PersistableObject
{
#region Type Identification
public static readonly PersistableType ThisTypeID = new PersistableType( "ri", new ConstructCallback( Construct ) );
public static readonly PersistableType ThisTypeID = new PersistableType( "ri", Construct );
private static PersistableObject Construct()
{

2
Scripts/Engines/Reports/Objects/Snapshots/Snapshot.cs
View file

@ -5,7 +5,7 @@ namespace Server.Engines.Reports
public class Snapshot : PersistableObject
{
#region Type Identification
public static readonly PersistableType ThisTypeID = new PersistableType( "ss", new ConstructCallback( Construct ) );
public static readonly PersistableType ThisTypeID = new PersistableType( "ss", Construct );
private static PersistableObject Construct()
{

2
Scripts/Engines/Reports/Objects/Snapshots/SnapshotHistory.cs
View file

@ -5,7 +5,7 @@ namespace Server.Engines.Reports
public class SnapshotHistory : PersistableObject
{
#region Type Identification
public static readonly PersistableType ThisTypeID = new PersistableType( "sh", new ConstructCallback( Construct ) );
public static readonly PersistableType ThisTypeID = new PersistableType( "sh", Construct );
private static PersistableObject Construct()
{

2
Scripts/Engines/Reports/Objects/Staffing/PageInfo.cs
View file

@ -16,7 +16,7 @@ namespace Server.Engines.Reports
public class PageInfo : PersistableObject
{
#region Type Identification
public static readonly PersistableType ThisTypeID = new PersistableType( "pi", new ConstructCallback( Construct ) );
public static readonly PersistableType ThisTypeID = new PersistableType( "pi", Construct );
private static PersistableObject Construct()
{

2
Scripts/Engines/Reports/Objects/Staffing/QueueStatus.cs
View file

@ -5,7 +5,7 @@ namespace Server.Engines.Reports
public class QueueStatus : PersistableObject
{
#region Type Identification
public static readonly PersistableType ThisTypeID = new PersistableType( "qs", new ConstructCallback( Construct ) );
public static readonly PersistableType ThisTypeID = new PersistableType( "qs", Construct );
private static PersistableObject Construct()
{

2
Scripts/Engines/Reports/Objects/Staffing/ResponseInfo.cs
View file

@ -5,7 +5,7 @@ namespace Server.Engines.Reports
public class ResponseInfo : PersistableObject
{
#region Type Identification
public static readonly PersistableType ThisTypeID = new PersistableType( "rs", new ConstructCallback( Construct ) );
public static readonly PersistableType ThisTypeID = new PersistableType( "rs", Construct );
private static PersistableObject Construct()
{

2
Scripts/Engines/Reports/Objects/Staffing/StaffHistory.cs
View file

@ -7,7 +7,7 @@ namespace Server.Engines.Reports
public class StaffHistory : PersistableObject
{
#region Type Identification
public static readonly PersistableType ThisTypeID = new PersistableType( "stfhst", new ConstructCallback( Construct ) );
public static readonly PersistableType ThisTypeID = new PersistableType( "stfhst", Construct );
private static PersistableObject Construct()
{

4
Scripts/Engines/Reports/Reports.cs
View file

@ -32,7 +32,7 @@ namespace Server.Engines.Reports
m_GenerateTime = date + TimeSpan.FromHours( Math.Ceiling( timeOfDay.TotalHours ) );
Timer.DelayCall( TimeSpan.FromMinutes( 0.5 ), TimeSpan.FromMinutes( 0.5 ), new TimerCallback( CheckRegenerate ) );
Timer.DelayCall( TimeSpan.FromMinutes( 0.5 ), TimeSpan.FromMinutes( 0.5 ), CheckRegenerate );
}
private static DateTime m_GenerateTime;
@ -62,7 +62,7 @@ namespace Server.Engines.Reports
m_StatsHistory.Snapshots.Add( ss );
m_StaffHistory.QueueStats.Add( new QueueStatus( Help.PageQueue.List.Count ) );
ThreadPool.QueueUserWorkItem( new WaitCallback( UpdateOutput ), ss );
ThreadPool.QueueUserWorkItem( UpdateOutput, ss );
}
private static void UpdateOutput( object state )

2
Scripts/Engines/VeteranRewards/Character Statue Maker/CharacterStatue.cs
View file

@ -233,7 +233,7 @@ namespace Server.Mobiles
if ( m_SculptedBy == null || Map == Map.Internal ) // Remove preview statues
{
Timer.DelayCall( TimeSpan.Zero, new TimerCallback( Delete ) );
Timer.DelayCall( TimeSpan.Zero, Delete );
}
}

2
Scripts/Engines/VeteranRewards/Character Statue Maker/CharacterStatuePlinth.cs
View file

@ -68,7 +68,7 @@ namespace Server.Items
if ( m_Statue?.SculptedBy == null || Map == Map.Internal )
{
Timer.DelayCall( TimeSpan.Zero, new TimerCallback( Delete ) );
Timer.DelayCall( TimeSpan.Zero, Delete );
}
}

2
Scripts/Engines/VeteranRewards/RewardSystem.cs
View file

@ -465,7 +465,7 @@ namespace Server.Engines.VeteranRewards
public static void Initialize()
{
if ( Enabled )
EventSink.Login += new LoginEventHandler( EventSink_Login );
EventSink.Login += EventSink_Login;
}
private static void EventSink_Login( LoginEventArgs e )

2
Scripts/Engines/Virtues/Compassion.cs
View file

@ -10,7 +10,7 @@ namespace Server
public static void Initialize()
{
VirtueGump.Register( 105, new OnVirtueUsed( OnVirtueUsed ) );
VirtueGump.Register( 105, OnVirtueUsed );
}
public static void OnVirtueUsed( Mobile from )

2
Scripts/Engines/Virtues/Honor.cs
View file

@ -13,7 +13,7 @@ namespace Server
public static void Initialize()
{
VirtueGump.Register( 107, new OnVirtueUsed( OnVirtueUsed ) );
VirtueGump.Register( 107, OnVirtueUsed );
}
private static void OnVirtueUsed( Mobile from )

4
Scripts/Engines/Virtues/Justice.cs
View file

@ -12,7 +12,7 @@ namespace Server
public static void Initialize()
{
VirtueGump.Register( 109, new OnVirtueUsed( OnVirtueUsed ) );
VirtueGump.Register( 109, OnVirtueUsed );
}
public static bool CheckMapRegion( Mobile first, Mobile second )
@ -65,7 +65,7 @@ namespace Server
}
else
{
protector.BeginTarget( 14, false, TargetFlags.None, new TargetCallback( OnVirtueTargeted ) );
protector.BeginTarget( 14, false, TargetFlags.None, OnVirtueTargeted );
protector.SendLocalizedMessage( 1049366 ); // Choose the player you wish to protect.
}
}

4
Scripts/Engines/Virtues/Sacrifice.cs
View file

@ -14,7 +14,7 @@ namespace Server
public static void Initialize()
{
VirtueGump.Register( 110, new OnVirtueUsed( OnVirtueUsed ) );
VirtueGump.Register( 110, OnVirtueUsed );
}
public static void OnVirtueUsed( Mobile from )
@ -137,7 +137,7 @@ namespace Server
from.SendLocalizedMessage( 1052010 ); // You have set the creature free.
Timer.DelayCall( TimeSpan.FromSeconds( 1.0 ), new TimerCallback( targ.Delete ) );
Timer.DelayCall( TimeSpan.FromSeconds( 1.0 ), targ.Delete );
pm.LastSacrificeGain = DateTime.UtcNow;

2
Scripts/Engines/Virtues/Valor.cs
View file

@ -12,7 +12,7 @@ namespace Server
public static void Initialize()
{
VirtueGump.Register( 112, new OnVirtueUsed( OnVirtueUsed ) );
VirtueGump.Register( 112, OnVirtueUsed );
}
public static void OnVirtueUsed( Mobile from )

6
Scripts/Engines/Virtues/VirtueGump.cs
View file

@ -13,9 +13,9 @@ namespace Server
public static void Initialize()
{
EventSink.VirtueGumpRequest += new VirtueGumpRequestEventHandler( EventSink_VirtueGumpRequest );
EventSink.VirtueItemRequest += new VirtueItemRequestEventHandler( EventSink_VirtueItemRequest );
EventSink.VirtueMacroRequest += new VirtueMacroRequestEventHandler( EventSink_VirtueMacroRequest );
EventSink.VirtueGumpRequest += EventSink_VirtueGumpRequest;
EventSink.VirtueItemRequest += EventSink_VirtueItemRequest;
EventSink.VirtueMacroRequest += EventSink_VirtueMacroRequest;
}
public static void Register( int gumpID, OnVirtueUsed callback )