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

@ -9,7 +9,7 @@ namespace Server
{
public static void Initialize()
{
EventSink.SocketConnect += new SocketConnectEventHandler( EventSink_SocketConnect );
EventSink.SocketConnect += EventSink_SocketConnect;
}
private static void EventSink_SocketConnect( SocketConnectEventArgs e )

View file

@ -493,9 +493,9 @@ namespace Server.Accounting
public static void Initialize()
{
EventSink.Connected += new ConnectedEventHandler( EventSink_Connected );
EventSink.Disconnected += new DisconnectedEventHandler( EventSink_Disconnected );
EventSink.Login += new LoginEventHandler( EventSink_Login );
EventSink.Connected += EventSink_Connected;
EventSink.Disconnected += EventSink_Disconnected;
EventSink.Login += EventSink_Login;
}
private static void EventSink_Connected( ConnectedEventArgs e )

View file

@ -15,9 +15,9 @@ namespace Server.Accounting
if ( !Enabled )
return;
PacketHandlers.RegisterThrottler( 0x80, new ThrottlePacketCallback( Throttle_Callback ) );
PacketHandlers.RegisterThrottler( 0x91, new ThrottlePacketCallback( Throttle_Callback ) );
PacketHandlers.RegisterThrottler( 0xCF, new ThrottlePacketCallback( Throttle_Callback ) );
PacketHandlers.RegisterThrottler( 0x80, Throttle_Callback );
PacketHandlers.RegisterThrottler( 0x91, Throttle_Callback );
PacketHandlers.RegisterThrottler( 0xCF, Throttle_Callback );
}
public static bool Throttle_Callback( NetState ns )

View file

@ -67,12 +67,12 @@ namespace Server.Misc
public static void Initialize()
{
EventSink.DeleteRequest += new DeleteRequestEventHandler( EventSink_DeleteRequest );
EventSink.AccountLogin += new AccountLoginEventHandler( EventSink_AccountLogin );
EventSink.GameLogin += new GameLoginEventHandler( EventSink_GameLogin );
EventSink.DeleteRequest += EventSink_DeleteRequest;
EventSink.AccountLogin += EventSink_AccountLogin;
EventSink.GameLogin += EventSink_GameLogin;
if ( PasswordCommandEnabled )
CommandSystem.Register( "Password", AccessLevel.Player, new CommandEventHandler( Password_OnCommand ) );
CommandSystem.Register( "Password", AccessLevel.Player, Password_OnCommand );
}
[Usage( "Password <newPassword> <repeatPassword>" )]

View file

@ -11,8 +11,8 @@ namespace Server.Accounting
public static void Configure()
{
EventSink.WorldLoad += new WorldLoadEventHandler( Load );
EventSink.WorldSave += new WorldSaveEventHandler( Save );
EventSink.WorldLoad += Load;
EventSink.WorldSave += Save;
}
static Accounts()

View file

@ -12,17 +12,17 @@ namespace Server.Commands
{
public static void Initialize()
{
CommandSystem.Register( "Tile", AccessLevel.GameMaster, new CommandEventHandler( Tile_OnCommand ) );
CommandSystem.Register( "TileRXYZ", AccessLevel.GameMaster, new CommandEventHandler( TileRXYZ_OnCommand ) );
CommandSystem.Register( "TileXYZ", AccessLevel.GameMaster, new CommandEventHandler( TileXYZ_OnCommand ) );
CommandSystem.Register( "TileZ", AccessLevel.GameMaster, new CommandEventHandler( TileZ_OnCommand ) );
CommandSystem.Register( "TileAvg", AccessLevel.GameMaster, new CommandEventHandler( TileAvg_OnCommand ) );
CommandSystem.Register( "Tile", AccessLevel.GameMaster, Tile_OnCommand );
CommandSystem.Register( "TileRXYZ", AccessLevel.GameMaster, TileRXYZ_OnCommand );
CommandSystem.Register( "TileXYZ", AccessLevel.GameMaster, TileXYZ_OnCommand );
CommandSystem.Register( "TileZ", AccessLevel.GameMaster, TileZ_OnCommand );
CommandSystem.Register( "TileAvg", AccessLevel.GameMaster, TileAvg_OnCommand );
CommandSystem.Register( "Outline", AccessLevel.GameMaster, new CommandEventHandler( Outline_OnCommand ) );
CommandSystem.Register( "OutlineRXYZ", AccessLevel.GameMaster, new CommandEventHandler( OutlineRXYZ_OnCommand ) );
CommandSystem.Register( "OutlineXYZ", AccessLevel.GameMaster, new CommandEventHandler( OutlineXYZ_OnCommand ) );
CommandSystem.Register( "OutlineZ", AccessLevel.GameMaster, new CommandEventHandler( OutlineZ_OnCommand ) );
CommandSystem.Register( "OutlineAvg", AccessLevel.GameMaster, new CommandEventHandler( OutlineAvg_OnCommand ) );
CommandSystem.Register( "Outline", AccessLevel.GameMaster, Outline_OnCommand );
CommandSystem.Register( "OutlineRXYZ", AccessLevel.GameMaster, OutlineRXYZ_OnCommand );
CommandSystem.Register( "OutlineXYZ", AccessLevel.GameMaster, OutlineXYZ_OnCommand );
CommandSystem.Register( "OutlineZ", AccessLevel.GameMaster, OutlineZ_OnCommand );
CommandSystem.Register( "OutlineAvg", AccessLevel.GameMaster, OutlineAvg_OnCommand );
}
public static void Invoke( Mobile from, Point3D start, Point3D end, string[] args )
@ -493,7 +493,7 @@ namespace Server.Commands
private static void Internal_OnCommand( CommandEventArgs e, bool outline )
{
if ( e.Length >= 1 )
BoundingBoxPicker.Begin( e.Mobile, new BoundingBoxCallback( TileBox_Callback ), new TileState( TileZType.Start, 0, e.Arguments, outline ) );
BoundingBoxPicker.Begin( e.Mobile, TileBox_Callback, new TileState( TileZType.Start, 0, e.Arguments, outline ) );
else
e.Mobile.SendMessage( "Format: {0} <type> [params] [set {{<propertyName> <value> ...}}]", outline ? "Outline" : "Tile" );
}
@ -547,7 +547,7 @@ namespace Server.Commands
for ( int i = 0; i < subArgs.Length; ++i )
subArgs[i] = e.Arguments[i + 1];
BoundingBoxPicker.Begin( e.Mobile, new BoundingBoxCallback( TileBox_Callback ), new TileState( TileZType.Fixed, e.GetInt32( 0 ), subArgs, outline ) );
BoundingBoxPicker.Begin( e.Mobile, TileBox_Callback, new TileState( TileZType.Fixed, e.GetInt32( 0 ), subArgs, outline ) );
}
else
{
@ -558,7 +558,7 @@ namespace Server.Commands
private static void InternalAvg_OnCommand( CommandEventArgs e, bool outline )
{
if ( e.Length >= 1 )
BoundingBoxPicker.Begin( e.Mobile, new BoundingBoxCallback( TileBox_Callback ), new TileState( TileZType.MapAverage, 0, e.Arguments, outline ) );
BoundingBoxPicker.Begin( e.Mobile, TileBox_Callback, new TileState( TileZType.MapAverage, 0, e.Arguments, outline ) );
else
e.Mobile.SendMessage( "Format: {0}Avg <type> [params] [set {{<propertyName> <value> ...}}]", outline ? "Outline" : "Tile" );
}

View file

@ -177,7 +177,7 @@ namespace Server.Commands
public static void Initialize()
{
CommandSystem.Register( "Batch", AccessLevel.Counselor, new CommandEventHandler( Batch_OnCommand ) );
CommandSystem.Register( "Batch", AccessLevel.Counselor, Batch_OnCommand );
}
[Usage( "Batch" )]

View file

@ -10,7 +10,7 @@ namespace Server.Commands
{
public static void Initialize()
{
CommandSystem.Register( "ConvertPlayers", AccessLevel.Administrator, new CommandEventHandler( Convert_OnCommand ) );
CommandSystem.Register( "ConvertPlayers", AccessLevel.Administrator, Convert_OnCommand );
}
public static void Convert_OnCommand( CommandEventArgs e )

View file

@ -13,7 +13,7 @@ namespace Server.Commands
{
public static void Initialize()
{
CommandSystem.Register( "Decorate", AccessLevel.Administrator, new CommandEventHandler( Decorate_OnCommand ) );
CommandSystem.Register( "Decorate", AccessLevel.Administrator, Decorate_OnCommand );
}
[Usage( "Decorate" )]

View file

@ -13,7 +13,7 @@ namespace Server.Commands
{
public static void Initialize()
{
CommandSystem.Register( "DecorateMag", AccessLevel.Administrator, new CommandEventHandler( DecorateMag_OnCommand ) );
CommandSystem.Register( "DecorateMag", AccessLevel.Administrator, DecorateMag_OnCommand );
}
[Usage( "DecorateMag" )]

View file

@ -14,7 +14,7 @@ namespace Server.Commands
{
public static void Initialize()
{
CommandSystem.Register( "DocGen", AccessLevel.Administrator, new CommandEventHandler( DocGen_OnCommand ) );
CommandSystem.Register( "DocGen", AccessLevel.Administrator, DocGen_OnCommand );
}
[Usage( "DocGen" )]

View file

@ -4,7 +4,7 @@ namespace Server.Commands
{
public static void Initialize()
{
CommandSystem.Register( "DragEffects", AccessLevel.Developer, new CommandEventHandler( DragEffects_OnCommand ) );
CommandSystem.Register( "DragEffects", AccessLevel.Developer, DragEffects_OnCommand );
}
[Usage( "DragEffects [enable=false]" )]

View file

@ -9,8 +9,8 @@ namespace Server.Commands
{
public static void Initialize()
{
CommandSystem.Register( "Dupe", AccessLevel.GameMaster, new CommandEventHandler( Dupe_OnCommand ) );
CommandSystem.Register( "DupeInBag", AccessLevel.GameMaster, new CommandEventHandler( DupeInBag_OnCommand ) );
CommandSystem.Register( "Dupe", AccessLevel.GameMaster, Dupe_OnCommand );
CommandSystem.Register( "DupeInBag", AccessLevel.GameMaster, DupeInBag_OnCommand );
}
[Usage( "Dupe [amount]" )]

View file

@ -10,7 +10,7 @@ namespace Server.Commands
public static void Initialize()
{
CommandSystem.Register( "ExportWSC", AccessLevel.Administrator, new CommandEventHandler( Export_OnCommand ) );
CommandSystem.Register( "ExportWSC", AccessLevel.Administrator, Export_OnCommand );
}
public static void Export_OnCommand( CommandEventArgs e )

View file

@ -35,7 +35,7 @@ namespace Server.Commands
public static void Initialize()
{
CommandSystem.Register( "RebuildCategorization", AccessLevel.Administrator, new CommandEventHandler( RebuildCategorization_OnCommand ) );
CommandSystem.Register( "RebuildCategorization", AccessLevel.Administrator, RebuildCategorization_OnCommand );
}
[Usage( "RebuildCategorization" )]

View file

@ -11,7 +11,7 @@ namespace Server.Commands
public static void Initialize()
{
CommandSystem.Register( "TelGen", AccessLevel.Administrator, new CommandEventHandler( GenTeleporter_OnCommand ) );
CommandSystem.Register( "TelGen", AccessLevel.Administrator, GenTeleporter_OnCommand );
}
[Usage( "TelGen" )]

View file

@ -256,7 +256,7 @@ namespace Server.Commands.Generic
AddResponse( "Open web browser request sent." );
mob.SendGump( new WarningGump( 1060637, 30720,
$"A game master is requesting to open your web browser to the following URL:<br>{url}", 0xFFC000, 320, 240, new WarningGumpCallback( OpenBrowser_Callback ), new object[]{ from, url, echo } ) );
$"A game master is requesting to open your web browser to the following URL:<br>{url}", 0xFFC000, 320, 240, OpenBrowser_Callback, new object[]{ from, url, echo } ) );
}
}
else
@ -798,7 +798,7 @@ namespace Server.Commands.Generic
if ( list.Count > 1 )
{
e.Mobile.SendGump( new WarningGump( 1060637, 30720,
$"You are about to delete {list.Count} objects. This cannot be undone without a full server revert.<br><br>Continue?", 0xFFC000, 420, 280, new WarningGumpCallback( OnConfirmCallback ), new object[]{ e, list } ) );
$"You are about to delete {list.Count} objects. This cannot be undone without a full server revert.<br><br>Continue?", 0xFFC000, 420, 280, OnConfirmCallback, new object[]{ e, list } ) );
AddResponse( "Awaiting confirmation..." );
}
else

View file

@ -96,7 +96,7 @@ namespace Server.Commands.Generic
public override void ExecuteList( CommandEventArgs e, ArrayList list )
{
e.Mobile.SendGump( new WarningGump( 1060637, 30720,
$"You are about to insert {list.Count} objects. This cannot be undone without a full server revert.<br><br>Continue?", 0xFFC000, 420, 280, new WarningGumpCallback( OnConfirmCallback ), new object[] { e, list, ( e.Length < 1 || !e.GetBoolean( 0 ) ) } ) );
$"You are about to insert {list.Count} objects. This cannot be undone without a full server revert.<br><br>Continue?", 0xFFC000, 420, 280, OnConfirmCallback, new object[] { e, list, ( e.Length < 1 || !e.GetBoolean( 0 ) ) } ) );
AddResponse( "Awaiting confirmation..." );
}

View file

@ -23,7 +23,7 @@ namespace Server.Commands.Generic
public override void Process( Mobile from, BaseCommand command, string[] args )
{
BoundingBoxPicker.Begin( from, new BoundingBoxCallback( OnTarget ), new object[]{ command, args } );
BoundingBoxPicker.Begin( from, OnTarget, new object[]{ command, args } );
}
public void OnTarget( Mobile from, Map map, Point3D start, Point3D end, object state )

View file

@ -307,7 +307,7 @@ namespace Server.Commands.Generic
return;
for ( int i = 0; i < m_Accessors.Length; ++i )
CommandSystem.Register( m_Accessors[i], m_AccessLevel, new CommandEventHandler( Execute ) );
CommandSystem.Register( m_Accessors[i], m_AccessLevel, Execute );
}
public static void Register( BaseCommandImplementor impl )

View file

@ -18,7 +18,7 @@ namespace Server.Commands.Generic
base.Register( command );
for ( int i = 0; i < command.Commands.Length; ++i )
CommandSystem.Register( command.Commands[i], command.AccessLevel, new CommandEventHandler( Redirect ) );
CommandSystem.Register( command.Commands[i], command.AccessLevel, Redirect );
}
public void Redirect( CommandEventArgs e )

View file

@ -21,55 +21,55 @@ namespace Server.Commands
{
CommandSystem.Prefix = "[";
Register( "Go", AccessLevel.Counselor, new CommandEventHandler( Go_OnCommand ) );
Register( "Go", AccessLevel.Counselor, Go_OnCommand );
Register( "DropHolding", AccessLevel.Counselor, new CommandEventHandler( DropHolding_OnCommand ) );
Register( "DropHolding", AccessLevel.Counselor, DropHolding_OnCommand );
Register( "GetFollowers", AccessLevel.GameMaster, new CommandEventHandler( GetFollowers_OnCommand ) );
Register( "GetFollowers", AccessLevel.GameMaster, GetFollowers_OnCommand );
Register( "ClearFacet", AccessLevel.Administrator, new CommandEventHandler( ClearFacet_OnCommand ) );
Register( "ClearFacet", AccessLevel.Administrator, ClearFacet_OnCommand );
Register( "Where", AccessLevel.Counselor, new CommandEventHandler( Where_OnCommand ) );
Register( "Where", AccessLevel.Counselor, Where_OnCommand );
Register( "AutoPageNotify", AccessLevel.Counselor, new CommandEventHandler( APN_OnCommand ) );
Register( "APN", AccessLevel.Counselor, new CommandEventHandler( APN_OnCommand ) );
Register( "AutoPageNotify", AccessLevel.Counselor, APN_OnCommand );
Register( "APN", AccessLevel.Counselor, APN_OnCommand );
Register( "Animate", AccessLevel.GameMaster, new CommandEventHandler( Animate_OnCommand ) );
Register( "Animate", AccessLevel.GameMaster, Animate_OnCommand );
Register( "Cast", AccessLevel.Counselor, new CommandEventHandler( Cast_OnCommand ) );
Register( "Cast", AccessLevel.Counselor, Cast_OnCommand );
Register( "Stuck", AccessLevel.Counselor, new CommandEventHandler( Stuck_OnCommand ) );
Register( "Stuck", AccessLevel.Counselor, Stuck_OnCommand );
Register( "Help", AccessLevel.Player, new CommandEventHandler( Help_OnCommand ) );
Register( "Help", AccessLevel.Player, Help_OnCommand );
Register( "Save", AccessLevel.Administrator, new CommandEventHandler( Save_OnCommand ) );
Register( "BackgroundSave", AccessLevel.Administrator, new CommandEventHandler( BackgroundSave_OnCommand ) );
Register( "BGSave", AccessLevel.Administrator, new CommandEventHandler( BackgroundSave_OnCommand ) );
Register( "SaveBG", AccessLevel.Administrator, new CommandEventHandler( BackgroundSave_OnCommand ) );
Register( "Save", AccessLevel.Administrator, Save_OnCommand );
Register( "BackgroundSave", AccessLevel.Administrator, BackgroundSave_OnCommand );
Register( "BGSave", AccessLevel.Administrator, BackgroundSave_OnCommand );
Register( "SaveBG", AccessLevel.Administrator, BackgroundSave_OnCommand );
Register( "Move", AccessLevel.GameMaster, new CommandEventHandler( Move_OnCommand ) );
Register( "Client", AccessLevel.Counselor, new CommandEventHandler( Client_OnCommand ) );
Register( "Move", AccessLevel.GameMaster, Move_OnCommand );
Register( "Client", AccessLevel.Counselor, Client_OnCommand );
Register( "SMsg", AccessLevel.Counselor, new CommandEventHandler( StaffMessage_OnCommand ) );
Register( "SM", AccessLevel.Counselor, new CommandEventHandler( StaffMessage_OnCommand ) );
Register( "S", AccessLevel.Counselor, new CommandEventHandler( StaffMessage_OnCommand ) );
Register( "SMsg", AccessLevel.Counselor, StaffMessage_OnCommand );
Register( "SM", AccessLevel.Counselor, StaffMessage_OnCommand );
Register( "S", AccessLevel.Counselor, StaffMessage_OnCommand );
Register( "BCast", AccessLevel.GameMaster, new CommandEventHandler( BroadcastMessage_OnCommand ) );
Register( "BC", AccessLevel.GameMaster, new CommandEventHandler( BroadcastMessage_OnCommand ) );
Register( "B", AccessLevel.GameMaster, new CommandEventHandler( BroadcastMessage_OnCommand ) );
Register( "BCast", AccessLevel.GameMaster, BroadcastMessage_OnCommand );
Register( "BC", AccessLevel.GameMaster, BroadcastMessage_OnCommand );
Register( "B", AccessLevel.GameMaster, BroadcastMessage_OnCommand );
Register( "Bank", AccessLevel.GameMaster, new CommandEventHandler( Bank_OnCommand ) );
Register( "Bank", AccessLevel.GameMaster, Bank_OnCommand );
Register( "Echo", AccessLevel.Counselor, new CommandEventHandler( Echo_OnCommand ) );
Register( "Echo", AccessLevel.Counselor, Echo_OnCommand );
Register( "Sound", AccessLevel.GameMaster, new CommandEventHandler( Sound_OnCommand ) );
Register( "Sound", AccessLevel.GameMaster, Sound_OnCommand );
Register( "ViewEquip", AccessLevel.GameMaster, new CommandEventHandler( ViewEquip_OnCommand ) );
Register( "ViewEquip", AccessLevel.GameMaster, ViewEquip_OnCommand );
Register( "Light", AccessLevel.Counselor, new CommandEventHandler( Light_OnCommand ) );
Register( "Stats", AccessLevel.Counselor, new CommandEventHandler( Stats_OnCommand ) );
Register( "Light", AccessLevel.Counselor, Light_OnCommand );
Register( "Stats", AccessLevel.Counselor, Stats_OnCommand );
Register( "SpeedBoost", AccessLevel.Counselor, new CommandEventHandler( SpeedBoost_OnCommand ) );
Register( "SpeedBoost", AccessLevel.Counselor, SpeedBoost_OnCommand );
}
public static void Register( string command, AccessLevel access, CommandEventHandler handler )
@ -137,7 +137,7 @@ namespace Server.Commands
[Description( "Drops the item, if any, that a targeted player is holding. The item is placed into their backpack, or if that's full, at their feet." )]
public static void DropHolding_OnCommand( CommandEventArgs e )
{
e.Mobile.BeginTarget( -1, false, TargetFlags.None, new TargetCallback( DropHolding_OnTarget ) );
e.Mobile.BeginTarget( -1, false, TargetFlags.None, DropHolding_OnTarget );
e.Mobile.SendMessage( "Target the player to drop what they are holding." );
}
@ -177,7 +177,7 @@ namespace Server.Commands
}
else
{
from.BeginTarget( -1, false, TargetFlags.None, new TargetCallback( DropHolding_OnTarget ) );
from.BeginTarget( -1, false, TargetFlags.None, DropHolding_OnTarget );
from.SendMessage( "That is not a player. Try again." );
}
}
@ -234,7 +234,7 @@ namespace Server.Commands
e.Mobile.SendGump(
new WarningGump( 1060635, 30720,
$"You are about to delete {list.Count} object{(list.Count == 1 ? "" : "s")} from this facet. Do you really wish to continue?",
0xFFC000, 360, 260, new WarningGumpCallback( DeleteList_Callback ), list ) );
0xFFC000, 360, 260, DeleteList_Callback, list ) );
}
else
{
@ -246,7 +246,7 @@ namespace Server.Commands
[Description( "Teleports all pets of a targeted player to your location." )]
public static void GetFollowers_OnCommand( CommandEventArgs e )
{
e.Mobile.BeginTarget( -1, false, TargetFlags.None, new TargetCallback( GetFollowers_OnTarget ) );
e.Mobile.BeginTarget( -1, false, TargetFlags.None, GetFollowers_OnTarget );
e.Mobile.SendMessage( "Target a player to get their pets." );
}
@ -313,7 +313,7 @@ namespace Server.Commands
}
else
{
from.BeginTarget( -1, false, TargetFlags.None, new TargetCallback( GetFollowers_OnTarget ) );
from.BeginTarget( -1, false, TargetFlags.None, GetFollowers_OnTarget );
from.SendMessage( "That is not a player. Try again." );
}
}

View file

@ -22,7 +22,7 @@ namespace Server.Commands
[CallPriority( 100 )]
public static void Initialize()
{
CommandSystem.Register( "HelpInfo", AccessLevel.Player, new CommandEventHandler( HelpInfo_OnCommand ) );
CommandSystem.Register( "HelpInfo", AccessLevel.Player, HelpInfo_OnCommand );
FillTable();
}

View file

@ -17,7 +17,7 @@ namespace Server.Commands
public static void Initialize()
{
EventSink.Command += new CommandEventHandler( EventSink_Command );
EventSink.Command += EventSink_Command;
if ( !Directory.Exists( "Logs" ) )
Directory.CreateDirectory( "Logs" );

View file

@ -9,13 +9,13 @@ namespace Server.Commands
{
public static void Initialize()
{
CommandSystem.Register( "DumpTimers", AccessLevel.Administrator, new CommandEventHandler( DumpTimers_OnCommand ) );
CommandSystem.Register( "CountObjects", AccessLevel.Administrator, new CommandEventHandler( CountObjects_OnCommand ) );
CommandSystem.Register( "ProfileWorld", AccessLevel.Administrator, new CommandEventHandler( ProfileWorld_OnCommand ) );
CommandSystem.Register( "TraceInternal", AccessLevel.Administrator, new CommandEventHandler( TraceInternal_OnCommand ) );
CommandSystem.Register( "TraceExpanded", AccessLevel.Administrator, new CommandEventHandler( TraceExpanded_OnCommand ) );
CommandSystem.Register( "WriteProfiles", AccessLevel.Administrator, new CommandEventHandler( WriteProfiles_OnCommand ) );
CommandSystem.Register( "SetProfiles", AccessLevel.Administrator, new CommandEventHandler( SetProfiles_OnCommand ) );
CommandSystem.Register( "DumpTimers", AccessLevel.Administrator, DumpTimers_OnCommand );
CommandSystem.Register( "CountObjects", AccessLevel.Administrator, CountObjects_OnCommand );
CommandSystem.Register( "ProfileWorld", AccessLevel.Administrator, ProfileWorld_OnCommand );
CommandSystem.Register( "TraceInternal", AccessLevel.Administrator, TraceInternal_OnCommand );
CommandSystem.Register( "TraceExpanded", AccessLevel.Administrator, TraceExpanded_OnCommand );
CommandSystem.Register( "WriteProfiles", AccessLevel.Administrator, WriteProfiles_OnCommand );
CommandSystem.Register( "SetProfiles", AccessLevel.Administrator, SetProfiles_OnCommand );
}
[Usage( "WriteProfiles" )]

View file

@ -19,7 +19,7 @@ namespace Server.Commands
{
public static void Initialize()
{
CommandSystem.Register( "Props", AccessLevel.Counselor, new CommandEventHandler( Props_OnCommand ) );
CommandSystem.Register( "Props", AccessLevel.Counselor, Props_OnCommand );
}
private class PropsTarget : Target

View file

@ -6,7 +6,7 @@ namespace Server.Commands
{
public static void Initialize()
{
CommandSystem.Register( "Time", AccessLevel.Player, new CommandEventHandler( Time_OnCommand ) );
CommandSystem.Register( "Time", AccessLevel.Player, Time_OnCommand );
}
[Usage( "Time" )]

View file

@ -24,7 +24,7 @@ namespace Server.Commands
public static void Initialize()
{
CommandSystem.Register( "SignGen", AccessLevel.Administrator, new CommandEventHandler( SignGen_OnCommand ) );
CommandSystem.Register( "SignGen", AccessLevel.Administrator, SignGen_OnCommand );
}
[Usage( "SignGen" )]

View file

@ -7,9 +7,9 @@ namespace Server.Commands
{
public static void Initialize()
{
CommandSystem.Register( "SetSkill", AccessLevel.GameMaster, new CommandEventHandler( SetSkill_OnCommand ) );
CommandSystem.Register( "GetSkill", AccessLevel.GameMaster, new CommandEventHandler( GetSkill_OnCommand ) );
CommandSystem.Register( "SetAllSkills", AccessLevel.GameMaster, new CommandEventHandler( SetAllSkills_OnCommand ) );
CommandSystem.Register( "SetSkill", AccessLevel.GameMaster, SetSkill_OnCommand );
CommandSystem.Register( "GetSkill", AccessLevel.GameMaster, GetSkill_OnCommand );
CommandSystem.Register( "SetAllSkills", AccessLevel.GameMaster, SetAllSkills_OnCommand );
}
[Usage( "SetSkill <name> <value>" )]

View file

@ -12,7 +12,7 @@ namespace Server.Commands
public static void Register()
{
CommandSystem.Register( "Skills", AccessLevel.Counselor, new CommandEventHandler( Skills_OnCommand ) );
CommandSystem.Register( "Skills", AccessLevel.Counselor, Skills_OnCommand );
}
private class SkillsTarget : Target

View file

@ -12,13 +12,13 @@ namespace Server
{
public static void Initialize()
{
CommandSystem.Register( "Freeze", AccessLevel.Administrator, new CommandEventHandler( Freeze_OnCommand ) );
CommandSystem.Register( "FreezeMap", AccessLevel.Administrator, new CommandEventHandler( FreezeMap_OnCommand ) );
CommandSystem.Register( "FreezeWorld", AccessLevel.Administrator, new CommandEventHandler( FreezeWorld_OnCommand ) );
CommandSystem.Register( "Freeze", AccessLevel.Administrator, Freeze_OnCommand );
CommandSystem.Register( "FreezeMap", AccessLevel.Administrator, FreezeMap_OnCommand );
CommandSystem.Register( "FreezeWorld", AccessLevel.Administrator, FreezeWorld_OnCommand );
CommandSystem.Register( "Unfreeze", AccessLevel.Administrator, new CommandEventHandler( Unfreeze_OnCommand ) );
CommandSystem.Register( "UnfreezeMap", AccessLevel.Administrator, new CommandEventHandler( UnfreezeMap_OnCommand ) );
CommandSystem.Register( "UnfreezeWorld", AccessLevel.Administrator, new CommandEventHandler( UnfreezeWorld_OnCommand ) );
CommandSystem.Register( "Unfreeze", AccessLevel.Administrator, Unfreeze_OnCommand );
CommandSystem.Register( "UnfreezeMap", AccessLevel.Administrator, UnfreezeMap_OnCommand );
CommandSystem.Register( "UnfreezeWorld", AccessLevel.Administrator, UnfreezeWorld_OnCommand );
}
private static Point3D NullP3D = new Point3D( int.MinValue, int.MinValue, int.MinValue );
@ -27,7 +27,7 @@ namespace Server
[Description( "Makes a targeted area of dynamic items static." )]
public static void Freeze_OnCommand( CommandEventArgs e )
{
BoundingBoxPicker.Begin( e.Mobile, new BoundingBoxCallback( FreezeBox_Callback ), null );
BoundingBoxPicker.Begin( e.Mobile, FreezeBox_Callback, null );
}
[Usage( "FreezeMap" )]
@ -37,14 +37,14 @@ namespace Server
Map map = e.Mobile.Map;
if ( map != null && map != Map.Internal )
SendWarning( e.Mobile, "You are about to freeze <u>all items in {0}</u>.", BaseFreezeWarning, map, NullP3D, NullP3D, new WarningGumpCallback( FreezeWarning_Callback ) );
SendWarning( e.Mobile, "You are about to freeze <u>all items in {0}</u>.", BaseFreezeWarning, map, NullP3D, NullP3D, FreezeWarning_Callback );
}
[Usage( "FreezeWorld" )]
[Description( "Makes every dynamic item on all maps static." )]
public static void FreezeWorld_OnCommand( CommandEventArgs e )
{
SendWarning( e.Mobile, "You are about to freeze <u>every item on every map</u>.", BaseFreezeWarning, null, NullP3D, NullP3D, new WarningGumpCallback( FreezeWarning_Callback ) );
SendWarning( e.Mobile, "You are about to freeze <u>every item on every map</u>.", BaseFreezeWarning, null, NullP3D, NullP3D, FreezeWarning_Callback );
}
public static void SendWarning( Mobile m, string header, string baseWarning, Map map, Point3D start, Point3D end, WarningGumpCallback callback )
@ -64,7 +64,7 @@ namespace Server
private static void FreezeBox_Callback( Mobile from, Map map, Point3D start, Point3D end, object state )
{
SendWarning( from, "You are about to freeze a section of items.", BaseFreezeWarning, map, start, end, new WarningGumpCallback( FreezeWarning_Callback ) );
SendWarning( from, "You are about to freeze a section of items.", BaseFreezeWarning, map, start, end, FreezeWarning_Callback );
}
private static void FreezeWarning_Callback( Mobile from, bool okay, object state )
@ -290,7 +290,7 @@ namespace Server
[Description( "Makes a targeted area of static items dynamic." )]
public static void Unfreeze_OnCommand( CommandEventArgs e )
{
BoundingBoxPicker.Begin( e.Mobile, new BoundingBoxCallback( UnfreezeBox_Callback ), null );
BoundingBoxPicker.Begin( e.Mobile, UnfreezeBox_Callback, null );
}
[Usage( "UnfreezeMap" )]
@ -300,19 +300,19 @@ namespace Server
Map map = e.Mobile.Map;
if ( map != null && map != Map.Internal )
SendWarning( e.Mobile, "You are about to unfreeze <u>all items in {0}</u>.", BaseUnfreezeWarning, map, NullP3D, NullP3D, new WarningGumpCallback( UnfreezeWarning_Callback ) );
SendWarning( e.Mobile, "You are about to unfreeze <u>all items in {0}</u>.", BaseUnfreezeWarning, map, NullP3D, NullP3D, UnfreezeWarning_Callback );
}
[Usage( "UnfreezeWorld" )]
[Description( "Makes every static item on all maps dynamic." )]
public static void UnfreezeWorld_OnCommand( CommandEventArgs e )
{
SendWarning( e.Mobile, "You are about to unfreeze <u>every item on every map</u>.", BaseUnfreezeWarning, null, NullP3D, NullP3D, new WarningGumpCallback( UnfreezeWarning_Callback ) );
SendWarning( e.Mobile, "You are about to unfreeze <u>every item on every map</u>.", BaseUnfreezeWarning, null, NullP3D, NullP3D, UnfreezeWarning_Callback );
}
private static void UnfreezeBox_Callback( Mobile from, Map map, Point3D start, Point3D end, object state )
{
SendWarning( from, "You are about to unfreeze a section of items.", BaseUnfreezeWarning, map, start, end, new WarningGumpCallback( UnfreezeWarning_Callback ) );
SendWarning( from, "You are about to unfreeze a section of items.", BaseUnfreezeWarning, map, start, end, UnfreezeWarning_Callback );
}
private static void UnfreezeWarning_Callback( Mobile from, bool okay, object state )

View file

@ -9,11 +9,11 @@ namespace Server.Commands
{
public static void Initialize()
{
EventSink.Login += new LoginEventHandler( OnLogin );
EventSink.Login += OnLogin;
CommandSystem.Register( "Vis", AccessLevel.Counselor, new CommandEventHandler( Vis_OnCommand ) );
CommandSystem.Register( "VisList", AccessLevel.Counselor, new CommandEventHandler( VisList_OnCommand ) );
CommandSystem.Register( "VisClear", AccessLevel.Counselor, new CommandEventHandler( VisClear_OnCommand ) );
CommandSystem.Register( "Vis", AccessLevel.Counselor, Vis_OnCommand );
CommandSystem.Register( "VisList", AccessLevel.Counselor, VisList_OnCommand );
CommandSystem.Register( "VisClear", AccessLevel.Counselor, VisClear_OnCommand );
}
public static void OnLogin( LoginEventArgs e )

View file

@ -18,10 +18,10 @@ namespace Server.Commands
public static void Initialize()
{
CommandSystem.Register( "Wipe", AccessLevel.GameMaster, new CommandEventHandler( WipeAll_OnCommand ) );
CommandSystem.Register( "WipeItems", AccessLevel.GameMaster, new CommandEventHandler( WipeItems_OnCommand ) );
CommandSystem.Register( "WipeNPCs", AccessLevel.GameMaster, new CommandEventHandler( WipeNPCs_OnCommand ) );
CommandSystem.Register( "WipeMultis", AccessLevel.GameMaster, new CommandEventHandler( WipeMultis_OnCommand ) );
CommandSystem.Register( "Wipe", AccessLevel.GameMaster, WipeAll_OnCommand );
CommandSystem.Register( "WipeItems", AccessLevel.GameMaster, WipeItems_OnCommand );
CommandSystem.Register( "WipeNPCs", AccessLevel.GameMaster, WipeNPCs_OnCommand );
CommandSystem.Register( "WipeMultis", AccessLevel.GameMaster, WipeMultis_OnCommand );
}
[Usage( "Wipe" )]
@ -54,7 +54,7 @@ namespace Server.Commands
public static void BeginWipe( Mobile from, WipeType type )
{
BoundingBoxPicker.Begin( from, new BoundingBoxCallback( WipeBox_Callback ), type );
BoundingBoxPicker.Begin( from, WipeBox_Callback, type );
}
private static void WipeBox_Callback( Mobile from, Map map, Point3D start, Point3D end, object state )

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 },

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 );
}
}

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 )

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 )

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 )

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()

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()

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 )

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()

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()

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();
}
}

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()

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 )

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;

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!" );
}
} );
}

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 )

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;
}

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 );
}
}

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 )

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;

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 )

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 )

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
}
}

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 )

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 )

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()

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;

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
}
}

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()

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 );
}
}

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 )

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 )

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" )]

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 )

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;
}

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 );
}
}
}

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 )

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" )]

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;

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();

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 );
}
}

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 );
}
}

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." );
}

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." );
}

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 )

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 )

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()

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()

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 )

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 );
}
}
}

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()

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 )

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 )

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 )

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()
{

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()
{

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()
{

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()
{

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()
{

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()
{

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()
{

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()
{

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()
{

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()
{

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()
{

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()
{

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()
{

Some files were not shown because too many files have changed in this diff Show more