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

Removes redundant delegate type declarations

Browse source
This commit is contained in:
Kamron Batman 2018-09-14 14:32:04 -07:00
parent 3c9842ee5a
commit c85b0a740c
317 changed files with 898 additions and 903 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Scripts/Misc/Animations.cs
View file

@ -4,7 +4,7 @@ namespace Server.Misc
{
public static void Initialize()
{
EventSink.AnimateRequest += new AnimateRequestEventHandler( EventSink_AnimateRequest );
EventSink.AnimateRequest += EventSink_AnimateRequest;
}
private static void EventSink_AnimateRequest( AnimateRequestEventArgs e )

8
Scripts/Misc/Assistants.cs
View file

@ -87,15 +87,15 @@ namespace Server.Misc
{
private static Dictionary<Mobile, Timer> m_Dictionary = new Dictionary<Mobile, Timer>();
private static TimerStateCallback OnHandshakeTimeout_Callback = new TimerStateCallback(OnHandshakeTimeout);
private static TimerStateCallback OnForceDisconnect_Callback = new TimerStateCallback(OnForceDisconnect);
private static TimerStateCallback OnHandshakeTimeout_Callback = OnHandshakeTimeout;
private static TimerStateCallback OnForceDisconnect_Callback = OnForceDisconnect;
public static void Initialize()
{
if (Settings.Enabled)
{
EventSink.Login += new LoginEventHandler(EventSink_Login);
ProtocolExtensions.Register(0xFF, true, new OnPacketReceive(OnHandshakeResponse));
EventSink.Login += EventSink_Login;
ProtocolExtensions.Register(0xFF, true, OnHandshakeResponse);
}
}

2
Scripts/Misc/AttackMessage.cs
View file

@ -14,7 +14,7 @@ namespace Server.Misc
public static void Initialize()
{
EventSink.AggressiveAction += new AggressiveActionEventHandler( EventSink_AggressiveAction );
EventSink.AggressiveAction += EventSink_AggressiveAction;
}
public static void EventSink_AggressiveAction( AggressiveActionEventArgs e )

6
Scripts/Misc/AutoRestart.cs
View file

@ -19,7 +19,7 @@ namespace Server.Misc
public static void Initialize()
{
CommandSystem.Register( "Restart", AccessLevel.Administrator, new CommandEventHandler( Restart_OnCommand ) );
CommandSystem.Register( "Restart", AccessLevel.Administrator, Restart_OnCommand );
new AutoRestart().Start();
}
@ -68,14 +68,14 @@ namespace Server.Misc
if ( WarningDelay > TimeSpan.Zero )
{
Warning_Callback();
DelayCall( WarningDelay, WarningDelay, new TimerCallback( Warning_Callback ) );
DelayCall( WarningDelay, WarningDelay, Warning_Callback );
}
AutoSave.Save();
m_Restarting = true;
DelayCall( RestartDelay, new TimerCallback( Restart_Callback ) );
DelayCall( RestartDelay, Restart_Callback );
}
}
}

4
Scripts/Misc/AutoSave.cs
View file

@ -13,7 +13,7 @@ namespace Server.Misc
public static void Initialize()
{
new AutoSave().Start();
CommandSystem.Register( "SetSaves", AccessLevel.Administrator, new CommandEventHandler( SetSaves_OnCommand ) );
CommandSystem.Register( "SetSaves", AccessLevel.Administrator, SetSaves_OnCommand );
}
private static bool m_SavesEnabled = true;
@ -66,7 +66,7 @@ namespace Server.Misc
else
World.Broadcast( 0x35, true, "The world will save in {0} second{1}.", s, s != 1 ? "s" : "" );
DelayCall( m_Warning, new TimerCallback( Save ) );
DelayCall( m_Warning, Save );
}
}

4
Scripts/Misc/Broadcasts.cs
View file

@ -4,8 +4,8 @@ namespace Server.Misc
{
public static void Initialize()
{
EventSink.Crashed += new CrashedEventHandler( EventSink_Crashed );
EventSink.Shutdown += new ShutdownEventHandler( EventSink_Shutdown );
EventSink.Crashed += EventSink_Crashed;
EventSink.Shutdown += EventSink_Shutdown;
}
public static void EventSink_Crashed( CrashedEventArgs e )

17
Scripts/Misc/BuffIcons.cs
View file

@ -12,11 +12,11 @@ namespace Server
{
if ( Enabled )
{
EventSink.ClientVersionReceived += new ClientVersionReceivedHandler( delegate( ClientVersionReceivedArgs args )
EventSink.ClientVersionReceived += delegate( ClientVersionReceivedArgs args )
{
if ( args.State.Mobile is PlayerMobile pm )
Timer.DelayCall( TimeSpan.Zero, pm.ResendBuffs );
} );
};
}
}
@ -72,14 +72,13 @@ namespace Server
m_TimeLength = length;
m_TimeStart = DateTime.UtcNow;
m_Timer = Timer.DelayCall( length, new TimerCallback(
delegate
{
if ( !(m is PlayerMobile pm) )
return;
m_Timer = Timer.DelayCall( length, delegate
{
if ( !(m is PlayerMobile pm) )
return;
pm.RemoveBuff( this );
} ) );
pm.RemoveBuff( this );
} );
}

2
Scripts/Misc/CharacterCreation.cs
View file

@ -11,7 +11,7 @@ namespace Server.Misc
public static void Initialize()
{
// Register our event handler
EventSink.CharacterCreated += new CharacterCreatedEventHandler( EventSink_CharacterCreated );
EventSink.CharacterCreated += EventSink_CharacterCreated;
}
private static void AddBackpack( Mobile m )

2
Scripts/Misc/Cleanup.cs
View file

@ -10,7 +10,7 @@ namespace Server.Misc
{
public static void Initialize()
{
Timer.DelayCall( TimeSpan.FromSeconds( 2.5 ), new TimerCallback( Run ) );
Timer.DelayCall( TimeSpan.FromSeconds( 2.5 ), Run );
}
public static void Run()

2
Scripts/Misc/ClientVerification.cs
View file

@ -61,7 +61,7 @@ namespace Server.Misc
public static void Initialize()
{
EventSink.ClientVersionReceived += new ClientVersionReceivedHandler( EventSink_ClientVersionReceived );
EventSink.ClientVersionReceived += EventSink_ClientVersionReceived;
//ClientVersion.Required = null;
//Required = new ClientVersion( "6.0.0.0" );

2
Scripts/Misc/CrashGuard.cs
View file

@ -18,7 +18,7 @@ namespace Server.Misc
public static void Initialize()
{
if ( Enabled ) // If enabled, register our crash event handler
EventSink.Crashed += new CrashedEventHandler( CrashGuard_OnCrash );
EventSink.Crashed += CrashGuard_OnCrash;
}
public static void CrashGuard_OnCrash( CrashedEventArgs e )

2
Scripts/Misc/CurrentExpansion.cs
View file

@ -32,7 +32,7 @@ namespace Server
PacketHandlers.SingleClickProps = true; // single click for everything is overridden to check object property list
Mobile.ActionDelay = 1000;
Mobile.AOSStatusHandler = new AOSStatusHandler( AOS.GetStatus );
Mobile.AOSStatusHandler = AOS.GetStatus;
}
}
}

2
Scripts/Misc/DoorGenerator.cs
View file

@ -324,7 +324,7 @@ namespace Server
public static void Initialize()
{
CommandSystem.Register( "DoorGen", AccessLevel.Administrator, new CommandEventHandler( DoorGen_OnCommand ) );
CommandSystem.Register( "DoorGen", AccessLevel.Administrator, DoorGen_OnCommand );
}
[Usage( "DoorGen" )]

2
Scripts/Misc/Email.cs
View file

@ -82,7 +82,7 @@ namespace Server.Misc
public static void AsyncSend( MailMessage message )
{
ThreadPool.QueueUserWorkItem( new WaitCallback( SendCallback ), message );
ThreadPool.QueueUserWorkItem( SendCallback, message );
}
private static void SendCallback( object state )

2
Scripts/Misc/Fastwalk.cs
View file

@ -19,7 +19,7 @@ namespace Server.Misc
Mobile.FwdAccessOverride = AccessOverride;
if ( Enabled )
EventSink.FastWalk += new FastWalkEventHandler( OnFastWalk );
EventSink.FastWalk += OnFastWalk;
}
public static void OnFastWalk( FastWalkEventArgs e )

4
Scripts/Misc/Gifts/Winter2004/Mistletoe.cs
View file

@ -48,7 +48,7 @@ namespace Server.Items
int version = reader.ReadInt();
Timer.DelayCall( TimeSpan.Zero, new TimerCallback( FixMovingCrate ) );
Timer.DelayCall( TimeSpan.Zero, FixMovingCrate );
}
private void FixMovingCrate()
@ -221,7 +221,7 @@ namespace Server.Items
if ( house != null && house.IsCoOwner( from ) )
{
from.SendLocalizedMessage( 1062838 ); // Where would you like to place this decoration?
from.BeginTarget( -1, true, TargetFlags.None, new TargetStateCallback( Placement_OnTarget ), null );
from.BeginTarget( -1, true, TargetFlags.None, Placement_OnTarget, null );
}
else
{

8
Scripts/Misc/Guild.cs
View file

@ -565,10 +565,10 @@ namespace Server.Guilds
{
public static void Configure()
{
EventSink.CreateGuild += new CreateGuildHandler( EventSink_CreateGuild );
EventSink.GuildGumpRequest += new GuildGumpRequestHandler( EventSink_GuildGumpRequest );
EventSink.CreateGuild += EventSink_CreateGuild;
EventSink.GuildGumpRequest += EventSink_GuildGumpRequest;
CommandSystem.Register( "GuildProps", AccessLevel.Counselor, new CommandEventHandler( GuildProps_OnCommand ) );
CommandSystem.Register( "GuildProps", AccessLevel.Counselor, GuildProps_OnCommand );
}
#region GuildProps
@ -1272,7 +1272,7 @@ namespace Server.Guilds
Disband();
*/
Timer.DelayCall( TimeSpan.Zero, new TimerCallback( VerifyGuild_Callback ) );
Timer.DelayCall( TimeSpan.Zero, VerifyGuild_Callback );
}
private void VerifyGuild_Callback()

8
Scripts/Misc/HardwareInfo.cs
View file

@ -101,16 +101,16 @@ namespace Server
public static void Initialize()
{
PacketHandlers.Register( 0xD9, 0x10C, false, new OnPacketReceive( OnReceive ) );
PacketHandlers.Register( 0xD9, 0x10C, false, OnReceive );
CommandSystem.Register( "HWInfo", AccessLevel.GameMaster, new CommandEventHandler( HWInfo_OnCommand ) );
CommandSystem.Register( "HWInfo", AccessLevel.GameMaster, HWInfo_OnCommand );
}
[Usage( "HWInfo" )]
[Description( "Displays information about a targeted player's hardware." )]
public static void HWInfo_OnCommand( CommandEventArgs e )
{
e.Mobile.BeginTarget( -1, false, TargetFlags.None, new TargetCallback( HWInfo_OnTarget ) );
e.Mobile.BeginTarget( -1, false, TargetFlags.None, HWInfo_OnTarget );
e.Mobile.SendMessage( "Target a player to view their hardware information." );
}
@ -137,7 +137,7 @@ namespace Server
}
else
{
from.BeginTarget( -1, false, TargetFlags.None, new TargetCallback( HWInfo_OnTarget ) );
from.BeginTarget( -1, false, TargetFlags.None, HWInfo_OnTarget );
from.SendMessage( "That is not a player. Try again." );
}
}

2
Scripts/Misc/Keywords.cs
View file

@ -9,7 +9,7 @@ namespace Server.Misc
public static void Initialize()
{
// Register our speech handler
EventSink.Speech += new SpeechEventHandler( EventSink_Speech );
EventSink.Speech += EventSink_Speech;
}
public static void EventSink_Speech( SpeechEventArgs args )

2
Scripts/Misc/LanguageStatistics.cs
View file

@ -237,7 +237,7 @@ namespace Server.Misc
public static void Initialize()
{
CommandSystem.Register( "LanguageStatistics", AccessLevel.Administrator, new CommandEventHandler( LanguageStatistics_OnCommand ) );
CommandSystem.Register( "LanguageStatistics", AccessLevel.Administrator, LanguageStatistics_OnCommand );
}
[Usage( "LanguageStatistics" )]

4
Scripts/Misc/LightCycle.cs
View file

@ -33,9 +33,9 @@ namespace Server
public static void Initialize()
{
new LightCycleTimer().Start();
EventSink.Login += new LoginEventHandler( OnLogin );
EventSink.Login += OnLogin;
CommandSystem.Register( "GlobalLight", AccessLevel.GameMaster, new CommandEventHandler( Light_OnCommand ) );
CommandSystem.Register( "GlobalLight", AccessLevel.GameMaster, Light_OnCommand );
}
[Usage( "GlobalLight <value>" )]

2
Scripts/Misc/LoginStats.cs
View file

@ -7,7 +7,7 @@ namespace Server.Misc
public static void Initialize()
{
// Register our event handler
EventSink.Login += new LoginEventHandler( EventSink_Login );
EventSink.Login += EventSink_Login;
}
private static void EventSink_Login( LoginEventArgs args )

4
Scripts/Misc/MapUO.cs
View file

@ -17,10 +17,10 @@ namespace Server.Misc
public static void Initialize()
{
if ( Settings.PartyTrack )
ProtocolExtensions.Register( 0x00, true, new OnPacketReceive( OnPartyTrack ) );
ProtocolExtensions.Register( 0x00, true, OnPartyTrack );
if ( Settings.GuildTrack )
ProtocolExtensions.Register( 0x01, true, new OnPacketReceive( OnGuildTrack ) );
ProtocolExtensions.Register( 0x01, true, OnGuildTrack );
}
private static void OnPartyTrack( NetState state, PacketReader pvSrc )

2
Scripts/Misc/NameVerification.cs
View file

@ -12,7 +12,7 @@ namespace Server.Misc
public static void Initialize()
{
CommandSystem.Register( "ValidateName", AccessLevel.Administrator, new CommandEventHandler( ValidateName_OnCommand ) );
CommandSystem.Register( "ValidateName", AccessLevel.Administrator, ValidateName_OnCommand );
}
[Usage( "ValidateName" )]

6
Scripts/Misc/Notoriety.cs
View file

@ -22,10 +22,10 @@ namespace Server.Misc
Notoriety.Hues[Notoriety.Murderer] = 0x22;
Notoriety.Hues[Notoriety.Invulnerable] = 0x35;
Notoriety.Handler = new NotorietyHandler( MobileNotoriety );
Notoriety.Handler = MobileNotoriety;
Mobile.AllowBeneficialHandler = new AllowBeneficialHandler( Mobile_AllowBeneficial );
Mobile.AllowHarmfulHandler = new AllowHarmfulHandler( Mobile_AllowHarmful );
Mobile.AllowBeneficialHandler = Mobile_AllowBeneficial;
Mobile.AllowHarmfulHandler = Mobile_AllowHarmful;
}
private enum GuildStatus { None, Peaceful, Waring }

2
Scripts/Misc/Paperdoll.cs
View file

@ -7,7 +7,7 @@ namespace Server.Misc
{
public static void Initialize()
{
EventSink.PaperdollRequest += new PaperdollRequestEventHandler( EventSink_PaperdollRequest );
EventSink.PaperdollRequest += EventSink_PaperdollRequest;
}
public static void EventSink_PaperdollRequest( PaperdollRequestEventArgs e )

2
Scripts/Misc/ProfanityProtection.cs
View file

@ -20,7 +20,7 @@ namespace Server.Misc
public static void Initialize()
{
if ( Enabled )
EventSink.Speech += new SpeechEventHandler( EventSink_Speech );
EventSink.Speech += EventSink_Speech;
}
private static bool OnProfanityDetected( Mobile from, string speech )

4
Scripts/Misc/Profile.cs
View file

@ -8,8 +8,8 @@ namespace Server.Misc
{
public static void Initialize()
{
EventSink.ProfileRequest += new ProfileRequestEventHandler( EventSink_ProfileRequest );
EventSink.ChangeProfileRequest += new ChangeProfileRequestEventHandler( EventSink_ChangeProfileRequest );
EventSink.ProfileRequest += EventSink_ProfileRequest;
EventSink.ChangeProfileRequest += EventSink_ChangeProfileRequest;
}
public static void EventSink_ChangeProfileRequest( ChangeProfileRequestEventArgs e )

2
Scripts/Misc/ProtocolExtensions.cs
View file

@ -9,7 +9,7 @@ namespace Server.Misc
public static void Initialize()
{
PacketHandlers.Register( 0xF0, 0, false, new OnPacketReceive( DecodeBundledPacket ) );
PacketHandlers.Register( 0xF0, 0, false, DecodeBundledPacket );
}
public static void Register( int packetID, bool ingame, OnPacketReceive onReceive )

6
Scripts/Misc/RegenRates.cs
View file

@ -16,12 +16,12 @@ namespace Server.Misc
Mobile.DefaultStamRate = TimeSpan.FromSeconds( 7.0 );
Mobile.DefaultManaRate = TimeSpan.FromSeconds( 7.0 );
Mobile.ManaRegenRateHandler = new RegenRateHandler( Mobile_ManaRegenRate );
Mobile.ManaRegenRateHandler = Mobile_ManaRegenRate;
if ( Core.AOS )
{
Mobile.StamRegenRateHandler = new RegenRateHandler( Mobile_StamRegenRate );
Mobile.HitsRegenRateHandler = new RegenRateHandler( Mobile_HitsRegenRate );
Mobile.StamRegenRateHandler = Mobile_StamRegenRate;
Mobile.HitsRegenRateHandler = Mobile_HitsRegenRate;
}
}

2
Scripts/Misc/RenameRequests.cs
View file

@ -6,7 +6,7 @@ namespace Server.Misc
{
public static void Initialize()
{
EventSink.RenameRequest += new RenameRequestEventHandler( EventSink_RenameRequest );
EventSink.RenameRequest += EventSink_RenameRequest;
}
private static void EventSink_RenameRequest( RenameRequestEventArgs e )

2
Scripts/Misc/ServerList.cs
View file

@ -52,7 +52,7 @@ namespace Server.Misc
Resolve( Address, out m_PublicAddress );
}
EventSink.ServerList += new ServerListEventHandler( EventSink_ServerList );
EventSink.ServerList += EventSink_ServerList;
}
private static IPAddress m_PublicAddress;

4
Scripts/Misc/ShardPoller.cs
View file

@ -158,7 +158,7 @@ namespace Server.Misc
public static void Initialize()
{
EventSink.Login += new LoginEventHandler( EventSink_Login );
EventSink.Login += EventSink_Login;
}
private static List<ShardPoller> m_ActivePollers = new List<ShardPoller>();
@ -611,7 +611,7 @@ namespace Server.Misc
if ( text == null )
return null;
return m_UrlRegex.Replace( text, new MatchEvaluator( UrlRegex_Match ) );
return m_UrlRegex.Replace( text, UrlRegex_Match );
}
public override void OnResponse( Mobile from, string text )

8
Scripts/Misc/SkillCheck.cs
View file

@ -72,11 +72,11 @@ namespace Server.Misc
public static void Initialize()
{
Mobile.SkillCheckLocationHandler = new SkillCheckLocationHandler( Mobile_SkillCheckLocation );
Mobile.SkillCheckDirectLocationHandler = new SkillCheckDirectLocationHandler( Mobile_SkillCheckDirectLocation );
Mobile.SkillCheckLocationHandler = Mobile_SkillCheckLocation;
Mobile.SkillCheckDirectLocationHandler = Mobile_SkillCheckDirectLocation;
Mobile.SkillCheckTargetHandler = new SkillCheckTargetHandler( Mobile_SkillCheckTarget );
Mobile.SkillCheckDirectTargetHandler = new SkillCheckDirectTargetHandler( Mobile_SkillCheckDirectTarget );
Mobile.SkillCheckTargetHandler = Mobile_SkillCheckTarget;
Mobile.SkillCheckDirectTargetHandler = Mobile_SkillCheckDirectTarget;
}
public static bool Mobile_SkillCheckLocation( Mobile from, SkillName skillName, double minSkill, double maxSkill )

2
Scripts/Misc/SocketOptions.cs
View file

@ -21,7 +21,7 @@ namespace Server
{
SendQueue.CoalesceBufferSize = CoalesceBufferSize;
EventSink.SocketConnect += new SocketConnectEventHandler( EventSink_SocketConnect );
EventSink.SocketConnect += EventSink_SocketConnect;
Listener.EndPoints = m_ListenerEndPoints;
}

2
Scripts/Misc/ValidationQueue.cs
View file

@ -25,7 +25,7 @@ namespace Server
static ValidationQueue()
{
m_Queue = new List<T>();
ValidationQueue.StartValidation += new ValidationEventHandler( ValidateAll );
ValidationQueue.StartValidation += ValidateAll;
}
public static void Add( T obj )

2
Scripts/Misc/VendorGenerator.cs
View file

@ -10,7 +10,7 @@ namespace Server
{
public static void Initialize()
{
CommandSystem.Register( "VendorGen", AccessLevel.Administrator, new CommandEventHandler( VendorGen_OnCommand ) );
CommandSystem.Register( "VendorGen", AccessLevel.Administrator, VendorGen_OnCommand );
}
private static Rectangle2D[] m_BritRegions = {

2
Scripts/Misc/Weather.cs
View file

@ -200,7 +200,7 @@ namespace Server.Misc
list?.Add( this );
Timer.DelayCall( TimeSpan.FromSeconds( (0.2+(Utility.RandomDouble()*0.8)) * interval.TotalSeconds ), interval, new TimerCallback( OnTick ) );
Timer.DelayCall( TimeSpan.FromSeconds( (0.2+(Utility.RandomDouble()*0.8)) * interval.TotalSeconds ), interval, OnTick );
}
public virtual void Reposition()

2
Scripts/Misc/WeightOverloading.cs
View file

@ -13,7 +13,7 @@ namespace Server.Misc
{
public static void Initialize()
{
EventSink.Movement += new MovementEventHandler( EventSink_Movement );
EventSink.Movement += EventSink_Movement;
}
private static DFAlgorithm m_DFA;

2
Scripts/Misc/uoamVendors.cs
View file

@ -22,7 +22,7 @@ namespace Server
public static void Initialize()
{
CommandSystem.Register( "UOAMVendors", AccessLevel.Administrator, new CommandEventHandler( Generate_OnCommand ) );
CommandSystem.Register( "UOAMVendors", AccessLevel.Administrator, Generate_OnCommand );
}
[Usage( "UOAMVendors" )]