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

Removes redundant delegate type declarations

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

2
Scripts/Items/Special/8th Anniversary Items/Dawn's Music Box/DawnsMusicBox.cs
View file

@ -134,7 +134,7 @@ namespace Server.Items
m_ItemID = ItemID;
m.Send( new PlayMusic( music ) );
m_Timer = Timer.DelayCall( TimeSpan.FromSeconds( 0.5 ), TimeSpan.FromSeconds( 0.5 ), 4, new TimerCallback( Animate ) );
m_Timer = Timer.DelayCall( TimeSpan.FromSeconds( 0.5 ), TimeSpan.FromSeconds( 0.5 ), 4, Animate );
}
public void EndMusic( Mobile m )

6
Scripts/Items/Special/8th Anniversary Items/FountainOfLife.cs
View file

@ -93,7 +93,7 @@ namespace Server.Items
{
m_Charges = charges;
m_Timer = Timer.DelayCall( RechargeTime, RechargeTime, new TimerCallback( Recharge ) );
m_Timer = Timer.DelayCall( RechargeTime, RechargeTime, Recharge );
}
public FountainOfLife( Serial serial )
@ -172,9 +172,9 @@ namespace Server.Items
DateTime next = reader.ReadDateTime();
if ( next < DateTime.UtcNow )
m_Timer = Timer.DelayCall( TimeSpan.Zero, RechargeTime, new TimerCallback( Recharge ) );
m_Timer = Timer.DelayCall( TimeSpan.Zero, RechargeTime, Recharge );
else
m_Timer = Timer.DelayCall( next - DateTime.UtcNow, RechargeTime, new TimerCallback( Recharge ) );
m_Timer = Timer.DelayCall( next - DateTime.UtcNow, RechargeTime, Recharge );
}
public void Recharge()

4
Scripts/Items/Special/Evil Home Decor Collection/CreepyPortrait.cs
View file

@ -34,7 +34,7 @@ namespace Server.Items
if ( ItemID == 0x2A69 || ItemID == 0x2A6D )
{
Up();
Timer.DelayCall( TimeSpan.FromSeconds( 0.5 ), TimeSpan.FromSeconds( 0.5 ), 2, new TimerCallback( Up ) );
Timer.DelayCall( TimeSpan.FromSeconds( 0.5 ), TimeSpan.FromSeconds( 0.5 ), 2, Up );
}
}
else if ( Utility.InRange( old, Location, 2 ) && !Utility.InRange( m.Location, Location, 2 ) )
@ -42,7 +42,7 @@ namespace Server.Items
if ( ItemID == 0x2A6C || ItemID == 0x2A70 )
{
Down();
Timer.DelayCall( TimeSpan.FromSeconds( 0.5 ), TimeSpan.FromSeconds( 0.5 ), 2, new TimerCallback( Down ) );
Timer.DelayCall( TimeSpan.FromSeconds( 0.5 ), TimeSpan.FromSeconds( 0.5 ), 2, Down );
}
}
}

4
Scripts/Items/Special/Evil Home Decor Collection/DisturbingPortrait.cs
View file

@ -12,7 +12,7 @@ namespace Server.Items
public DisturbingPortraitComponent() : base( 0x2A5D )
{
m_Timer = Timer.DelayCall( TimeSpan.FromMinutes( 3 ), TimeSpan.FromMinutes( 3 ), new TimerCallback( Change ) );
m_Timer = Timer.DelayCall( TimeSpan.FromMinutes( 3 ), TimeSpan.FromMinutes( 3 ), Change );
}
public DisturbingPortraitComponent( Serial serial ) : base( serial )
@ -48,7 +48,7 @@ namespace Server.Items
int version = reader.ReadEncodedInt();
m_Timer = Timer.DelayCall( TimeSpan.FromMinutes( 3 ), TimeSpan.FromMinutes( 3 ), new TimerCallback( Change ) );
m_Timer = Timer.DelayCall( TimeSpan.FromMinutes( 3 ), TimeSpan.FromMinutes( 3 ), Change );
}
private void Change()

6
Scripts/Items/Special/Evil Home Decor Collection/SacrificialAltar.cs
View file

@ -41,7 +41,7 @@ namespace Server.Items
m_Timer?.Stop();
m_Timer = Timer.DelayCall( TimeSpan.FromMinutes( 3 ), new TimerCallback( Empty ) );
m_Timer = Timer.DelayCall( TimeSpan.FromMinutes( 3 ), Empty );
}
return true;
@ -63,7 +63,7 @@ namespace Server.Items
m_Timer?.Stop();
m_Timer = Timer.DelayCall( TimeSpan.FromMinutes( 3 ), new TimerCallback( Empty ) );
m_Timer = Timer.DelayCall( TimeSpan.FromMinutes( 3 ), Empty );
}
return true;
@ -83,7 +83,7 @@ namespace Server.Items
int version = reader.ReadEncodedInt();
if ( Items.Count > 0 )
m_Timer = Timer.DelayCall( TimeSpan.FromMinutes( 3 ), new TimerCallback( Empty ) );
m_Timer = Timer.DelayCall( TimeSpan.FromMinutes( 3 ), Empty );
}
public virtual void Flip( Mobile from, Direction direction )

4
Scripts/Items/Special/Evil Home Decor Collection/UnsettlingPortrait.cs
View file

@ -12,7 +12,7 @@ namespace Server.Items
public UnsettlingPortraitComponent() : base( 0x2A65 )
{
m_Timer = Timer.DelayCall( TimeSpan.FromMinutes( 3 ), TimeSpan.FromMinutes( 3 ), new TimerCallback( ChangeDirection ) );
m_Timer = Timer.DelayCall( TimeSpan.FromMinutes( 3 ), TimeSpan.FromMinutes( 3 ), ChangeDirection );
}
public UnsettlingPortraitComponent( Serial serial ) : base( serial )
@ -47,7 +47,7 @@ namespace Server.Items
int version = reader.ReadEncodedInt();
m_Timer = Timer.DelayCall( TimeSpan.FromMinutes( 3 ), TimeSpan.FromMinutes( 3 ), new TimerCallback( ChangeDirection ) );
m_Timer = Timer.DelayCall( TimeSpan.FromMinutes( 3 ), TimeSpan.FromMinutes( 3 ), ChangeDirection );
}
private void ChangeDirection()

4
Scripts/Items/Special/Heritage Items/FruitTrees.cs
View file

@ -25,7 +25,7 @@ namespace Server.Items
public BaseFruitTreeAddon()
{
Timer.DelayCall( TimeSpan.FromMinutes( 5 ), new TimerCallback( Respawn ) );
Timer.DelayCall( TimeSpan.FromMinutes( 5 ), Respawn );
}
public BaseFruitTreeAddon( Serial serial ) : base( serial )
@ -51,7 +51,7 @@ namespace Server.Items
else
{
if ( --m_Fruits == 0 )
Timer.DelayCall( TimeSpan.FromMinutes( 30 ), new TimerCallback( Respawn ) );
Timer.DelayCall( TimeSpan.FromMinutes( 30 ), Respawn );
from.SendLocalizedMessage( 501016 ); // You pick some fruit and put it in your backpack.
}

4
Scripts/Items/Special/Holiday/Wreath.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()
@ -207,7 +207,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
{

4
Scripts/Items/Special/House Raffle/HouseRaffleStone.cs
View file

@ -248,7 +248,7 @@ namespace Server.Items
}
}
Timer.DelayCall( TimeSpan.FromMinutes( 1.0 ), TimeSpan.FromMinutes( 1.0 ), new TimerCallback( CheckEnd_OnTick ) );
Timer.DelayCall( TimeSpan.FromMinutes( 1.0 ), TimeSpan.FromMinutes( 1.0 ), CheckEnd_OnTick );
}
[Constructible]
@ -462,7 +462,7 @@ namespace Server.Items
else
{
from.SendGump( new WarningGump( 1150470, 0x7F00,
$"You are about to purchase a raffle ticket for the house plot located at {FormatLocation()}. The ticket price is {FormatPrice()}. Tickets are non-refundable and you can only purchase one ticket per account. Do you wish to continue?", 0xFFFFFF, 420, 280, new WarningGumpCallback( Purchase_Callback ), null ) ); // CONFIRM TICKET PURCHASE
$"You are about to purchase a raffle ticket for the house plot located at {FormatLocation()}. The ticket price is {FormatPrice()}. Tickets are non-refundable and you can only purchase one ticket per account. Do you wish to continue?", 0xFFFFFF, 420, 280, Purchase_Callback, null ) ); // CONFIRM TICKET PURCHASE
}
}

2
Scripts/Items/Special/ML/GrizzledMareStatuette.cs
View file

@ -74,7 +74,7 @@ namespace Server.Mobiles
if ( version < 1 )
{
Timer.DelayCall( TimeSpan.FromSeconds( 0 ), new TimerCallback( OnAfterDeserialize_Callback ) );
Timer.DelayCall( TimeSpan.FromSeconds( 0 ), OnAfterDeserialize_Callback );
}
}
}

2
Scripts/Items/Special/Mutation Core/PlagueBeastBlood.cs
View file

@ -13,7 +13,7 @@ namespace Server.Items
public PlagueBeastBlood() : base( 0x122C, 0 )
{
m_Timer = Timer.DelayCall( TimeSpan.FromSeconds( 1.5 ), TimeSpan.FromSeconds( 1.5 ), 3, new TimerCallback( Hemorrhage ) );
m_Timer = Timer.DelayCall( TimeSpan.FromSeconds( 1.5 ), TimeSpan.FromSeconds( 1.5 ), 3, Hemorrhage );
}
public override void OnAfterDelete()

2
Scripts/Items/Special/Mutation Core/PlagueBeastMutationCore.cs
View file

@ -38,7 +38,7 @@ namespace Server.Items
from.LocalOverheadMessage( MessageType.Regular, 0x34, 1071906 ); // * You remove the plague mutation core from the plague beast, causing it to dissolve into a pile of goo *
if ( owner != null )
Timer.DelayCall<PlagueBeastLord>( TimeSpan.FromSeconds( 1 ), new TimerStateCallback<PlagueBeastLord>( KillParent ), owner );
Timer.DelayCall<PlagueBeastLord>( TimeSpan.FromSeconds( 1 ), KillParent, owner );
return true;
}

8
Scripts/Items/Special/Mutation Core/PlagueBeastOrgans.cs
View file

@ -42,7 +42,7 @@ namespace Server.Items
Movable = false;
Timer.DelayCall( TimeSpan.Zero, new TimerCallback( Initialize ) );
Timer.DelayCall( TimeSpan.Zero, Initialize );
}
public virtual void Initialize()
@ -67,7 +67,7 @@ namespace Server.Items
{
if ( !m_Opened && m_Timer == null )
{
m_Timer = Timer.DelayCall<Mobile>( TimeSpan.FromSeconds( 3 ), new TimerStateCallback<Mobile>( FinishOpening ), from );
m_Timer = Timer.DelayCall<Mobile>( TimeSpan.FromSeconds( 3 ), FinishOpening, from );
scissors.PublicOverheadMessage( MessageType.Regular, 0x3B2, 1071897 ); // You carefully cut into the organ.
return true;
}
@ -392,7 +392,7 @@ namespace Server.Items
if ( to.Hue == 0x1 && m_Gland == null && item is PlagueBeastGland )
{
m_Gland = item;
m_Timer = Timer.DelayCall( TimeSpan.FromSeconds( 3 ), new TimerCallback( FinishHealing ) );
m_Timer = Timer.DelayCall( TimeSpan.FromSeconds( 3 ), FinishHealing );
from.SendAsciiMessage( 0x3B2, "* You place the healthy gland inside the organ sac *" );
item.Movable = false;
@ -420,7 +420,7 @@ namespace Server.Items
for ( int i = 0; i < 7 && i < Components.Count; i++ )
Components[ i ].Hue = 0x6;
m_Timer = Timer.DelayCall( TimeSpan.FromSeconds( 2 ), new TimerCallback( OpenOrgan ) );
m_Timer = Timer.DelayCall( TimeSpan.FromSeconds( 2 ), OpenOrgan );
}
public void OpenOrgan()

2
Scripts/Items/Special/Mutation Core/PlagueBeastVein.cs
View file

@ -22,7 +22,7 @@ namespace Server.Items
{
if ( !m_Cut && m_Timer == null )
{
m_Timer = Timer.DelayCall<Mobile>( TimeSpan.FromSeconds( 3 ), new TimerStateCallback<Mobile>( CuttingDone ), from );
m_Timer = Timer.DelayCall<Mobile>( TimeSpan.FromSeconds( 3 ), CuttingDone, from );
scissors.PublicOverheadMessage( MessageType.Regular, 0x3B2, 1071899 ); // You begin cutting through the vein.
return true;
}

8
Scripts/Items/Special/Solen Items/BallOfSummoning.cs
View file

@ -113,13 +113,13 @@ namespace Server.Items
{
if ( Pet == null )
{
list.Add( new BallEntry( new BallCallback( LinkPet ), 6180 ) );
list.Add( new BallEntry( LinkPet, 6180 ) );
}
else
{
list.Add(new BallEntry(new BallCallback( CastSummonPet ), 6181 ));
list.Add( new BallEntry( new BallCallback( UpdatePetName ), 6183 ) );
list.Add( new BallEntry( new BallCallback( UnlinkPet ), 6182 ) );
list.Add(new BallEntry(CastSummonPet, 6181 ));
list.Add( new BallEntry( UpdatePetName, 6183 ) );
list.Add( new BallEntry( UnlinkPet, 6182 ) );
}
}
}

8
Scripts/Items/Special/Solen Items/BraceletOfBinding.cs
View file

@ -110,10 +110,10 @@ namespace Server.Items
{
BraceletOfBinding bound = Bound;
list.Add( new BraceletEntry( new BraceletCallback( Activate ), 6170, bound != null ) );
list.Add( new BraceletEntry( new BraceletCallback( Search ), 6171, bound != null ) );
list.Add( new BraceletEntry( new BraceletCallback( Bind ), bound == null ? 6173 : 6174, true ) );
list.Add( new BraceletEntry( new BraceletCallback( Inscribe ), 6175, true ) );
list.Add( new BraceletEntry( Activate, 6170, bound != null ) );
list.Add( new BraceletEntry( Search, 6171, bound != null ) );
list.Add( new BraceletEntry( Bind, bound == null ? 6173 : 6174, true ) );
list.Add( new BraceletEntry( Inscribe, 6175, true ) );
}
}

2
Scripts/Items/Special/Valentines/2007/ValentinesCard.cs
View file

@ -63,7 +63,7 @@ namespace Server.Items
{
if (IsChildOf(from))
{
from.BeginTarget(10, false, TargetFlags.None, new TargetCallback(OnTarget));
from.BeginTarget(10, false, TargetFlags.None, OnTarget);
from.SendLocalizedMessage(1077497); //To whom do you wish to give this card?
}

4
Scripts/Items/Special/Veteran Rewards/MiningCart.cs
View file

@ -112,7 +112,7 @@ namespace Server.Items
break;
}
m_Timer = Timer.DelayCall( TimeSpan.FromDays( 1 ), TimeSpan.FromDays( 1 ), new TimerCallback( GiveResources ) );
m_Timer = Timer.DelayCall( TimeSpan.FromDays( 1 ), TimeSpan.FromDays( 1 ), GiveResources );
}
public MiningCart( Serial serial ) : base( serial )
@ -294,7 +294,7 @@ namespace Server.Items
if ( next < DateTime.UtcNow )
next = DateTime.UtcNow;
m_Timer = Timer.DelayCall( next - DateTime.UtcNow, TimeSpan.FromDays( 1 ), new TimerCallback( GiveResources ) );
m_Timer = Timer.DelayCall( next - DateTime.UtcNow, TimeSpan.FromDays( 1 ), GiveResources );
break;
}
}

4
Scripts/Items/Special/Veteran Rewards/TreeStump.cs
View file

@ -45,7 +45,7 @@ namespace Server.Items
{
AddComponent( new AddonComponent( itemID ), 0, 0, 0 );
m_Timer = Timer.DelayCall( TimeSpan.FromDays( 1 ), TimeSpan.FromDays( 1 ), new TimerCallback( GiveLogs ) );
m_Timer = Timer.DelayCall( TimeSpan.FromDays( 1 ), TimeSpan.FromDays( 1 ), GiveLogs );
}
public TreeStump( Serial serial ) : base( serial )
@ -151,7 +151,7 @@ namespace Server.Items
if ( next < DateTime.UtcNow )
next = DateTime.UtcNow;
m_Timer = Timer.DelayCall( next - DateTime.UtcNow, TimeSpan.FromDays( 1 ), new TimerCallback( GiveLogs ) );
m_Timer = Timer.DelayCall( next - DateTime.UtcNow, TimeSpan.FromDays( 1 ), GiveLogs );
}
}