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/Gumps/AddDoorGump.cs
View file

@ -91,7 +91,7 @@ namespace Server.Gumps
public static void Initialize()
{
CommandSystem.Register( "AddDoor", AccessLevel.GameMaster, new CommandEventHandler( AddDoor_OnCommand ) );
CommandSystem.Register( "AddDoor", AccessLevel.GameMaster, AddDoor_OnCommand );
}
[Usage( "AddDoor" )]

2
Scripts/Gumps/AddGump.cs
View file

@ -15,7 +15,7 @@ namespace Server.Gumps
public static void Initialize()
{
CommandSystem.Register( "AddMenu", AccessLevel.GameMaster, new CommandEventHandler( AddMenu_OnCommand ) );
CommandSystem.Register( "AddMenu", AccessLevel.GameMaster, AddMenu_OnCommand );
}
[Usage( "AddMenu [searchString]" )]

26
Scripts/Gumps/AdminGump.cs
View file

@ -125,7 +125,7 @@ namespace Server.Gumps
public static void Initialize()
{
CommandSystem.Register( "Admin", AccessLevel.Administrator, new CommandEventHandler( Admin_OnCommand ) );
CommandSystem.Register( "Admin", AccessLevel.Administrator, Admin_OnCommand );
}
[Usage( "Admin" )]
@ -1503,7 +1503,7 @@ namespace Server.Gumps
NetState.Resume();
from.SendGump( new NoticeGump( 1060637, 30720,
$"You have {(ban ? "banned" : "deleted")} the account{(rads.Count == 1 ? "" : "s")}.", 0xFFC000, 420, 280, new NoticeGumpCallback( ResendGump_Callback ), new object[]{ list, rads, ban ? page : 0 } ) );
$"You have {(ban ? "banned" : "deleted")} the account{(rads.Count == 1 ? "" : "s")}.", 0xFFC000, 420, 280, ResendGump_Callback, new object[]{ list, rads, ban ? page : 0 } ) );
if ( ban )
from.SendGump( new BanDurationGump( rads ) );
@ -1511,7 +1511,7 @@ namespace Server.Gumps
else
{
from.SendGump( new NoticeGump( 1060637, 30720,
$"You have chosen not to {(ban ? "ban" : "delete")} the account{(rads.Count == 1 ? "" : "s")}.", 0xFFC000, 420, 280, new NoticeGumpCallback( ResendGump_Callback ), new object[]{ list, rads, page } ) );
$"You have chosen not to {(ban ? "ban" : "delete")} the account{(rads.Count == 1 ? "" : "s")}.", 0xFFC000, 420, 280, ResendGump_Callback, new object[]{ list, rads, page } ) );
}
}
@ -2178,7 +2178,7 @@ namespace Server.Gumps
for ( int i = 0; i < list.Count; ++i )
sb.AppendFormat( "<br>- {0}", ((Account)list[i]).Username );
from.SendGump( new WarningGump( 1060635, 30720, sb.ToString(), 0xFFC000, 420, 400, new WarningGumpCallback( BanShared_Callback ), a ) );
from.SendGump( new WarningGump( 1060635, 30720, sb.ToString(), 0xFFC000, 420, 400, BanShared_Callback, a ) );
}
else if ( a.LoginIPs.Length > 0 )
{
@ -2199,7 +2199,7 @@ namespace Server.Gumps
if ( a.LoginIPs.Length > 0 )
{
from.SendGump( new WarningGump( 1060635, 30720,
$"You are about to firewall {a.LoginIPs.Length} address{(a.LoginIPs.Length != 1 ? "s" : "")}. Do you wish to continue?", 0xFFC000, 420, 400, new WarningGumpCallback( FirewallShared_Callback ), a ) );
$"You are about to firewall {a.LoginIPs.Length} address{(a.LoginIPs.Length != 1 ? "s" : "")}. Do you wish to continue?", 0xFFC000, 420, 400, FirewallShared_Callback, a ) );
}
else
{
@ -2292,7 +2292,7 @@ namespace Server.Gumps
break;
from.SendGump( new WarningGump( 1060635, 30720,
$"<center>Account of {a.Username}</center><br>You are about to <em><basefont color=red>permanently delete</basefont></em> the account. Likewise, all characters on the account will be deleted, including equipped, inventory, and banked items. Any houses tied to the account will be demolished.<br><br>Do you wish to continue?", 0xFFC000, 420, 280, new WarningGumpCallback( AccountDelete_Callback ), m_State ) );
$"<center>Account of {a.Username}</center><br>You are about to <em><basefont color=red>permanently delete</basefont></em> the account. Likewise, all characters on the account will be deleted, including equipped, inventory, and banked items. Any houses tied to the account will be demolished.<br><br>Do you wish to continue?", 0xFFC000, 420, 280, AccountDelete_Callback, m_State ) );
break;
}
case 26: // View all shared accounts
@ -2309,9 +2309,9 @@ namespace Server.Gumps
if ( rads.Count > 0 )
from.SendGump( new WarningGump( 1060635, 30720,
$"You are about to ban {rads.Count} marked account{(rads.Count == 1 ? "" : "s")}. Be cautioned, the only way to reverse this is by hand--manually unbanning each account.<br><br>Do you wish to continue?", 0xFFC000, 420, 280, new WarningGumpCallback( Marked_Callback ), new object[]{ true, list, rads, m_ListPage } ) );
$"You are about to ban {rads.Count} marked account{(rads.Count == 1 ? "" : "s")}. Be cautioned, the only way to reverse this is by hand--manually unbanning each account.<br><br>Do you wish to continue?", 0xFFC000, 420, 280, Marked_Callback, new object[]{ true, list, rads, m_ListPage } ) );
else
from.SendGump( new NoticeGump( 1060637, 30720, "You have not yet marked any accounts. Place a check mark next to the accounts you wish to ban and then try again.", 0xFFC000, 420, 280, new NoticeGumpCallback( ResendGump_Callback ), new object[]{ list, rads, m_ListPage } ) );
from.SendGump( new NoticeGump( 1060637, 30720, "You have not yet marked any accounts. Place a check mark next to the accounts you wish to ban and then try again.", 0xFFC000, 420, 280, ResendGump_Callback, new object[]{ list, rads, m_ListPage } ) );
break;
}
@ -2323,9 +2323,9 @@ namespace Server.Gumps
break;
if ( rads.Count > 0 )
from.SendGump( new WarningGump( 1060635, 30720, string.Format( "You are about to <em><basefont color=red>permanently delete</basefont></em> {0} marked account{1}. Likewise, all characters on the account{1} will be deleted, including equipped, inventory, and banked items. Any houses tied to the account{1} will be demolished.<br><br>Do you wish to continue?", rads.Count, rads.Count == 1 ? "" : "s" ), 0xFFC000, 420, 280, new WarningGumpCallback( Marked_Callback ), new object[]{ false, list, rads, m_ListPage } ) );
from.SendGump( new WarningGump( 1060635, 30720, string.Format( "You are about to <em><basefont color=red>permanently delete</basefont></em> {0} marked account{1}. Likewise, all characters on the account{1} will be deleted, including equipped, inventory, and banked items. Any houses tied to the account{1} will be demolished.<br><br>Do you wish to continue?", rads.Count, rads.Count == 1 ? "" : "s" ), 0xFFC000, 420, 280, Marked_Callback, new object[]{ false, list, rads, m_ListPage } ) );
else
from.SendGump( new NoticeGump( 1060637, 30720, "You have not yet marked any accounts. Place a check mark next to the accounts you wish to ban and then try again.", 0xFFC000, 420, 280, new NoticeGumpCallback( ResendGump_Callback ), new object[]{ list, rads, m_ListPage } ) );
from.SendGump( new NoticeGump( 1060637, 30720, "You have not yet marked any accounts. Place a check mark next to the accounts you wish to ban and then try again.", 0xFFC000, 420, 280, ResendGump_Callback, new object[]{ list, rads, m_ListPage } ) );
break;
}
@ -2440,7 +2440,7 @@ namespace Server.Gumps
from.SendGump( new AdminGump( from, AdminGumpPage.AccountDetails_Access_ClientIPs, 0, null, "This account has not yet been accessed.", m_State ) );
else
from.SendGump( new WarningGump( 1060635, 30720,
$"You are about to clear the address list for account {a} containing {ips.Length} {((ips.Length == 1) ? "entry" : "entries")}. Do you wish to continue?", 0xFFC000, 420, 280, new WarningGumpCallback( RemoveLoginIPs_Callback ), a ) );
$"You are about to clear the address list for account {a} containing {ips.Length} {((ips.Length == 1) ? "entry" : "entries")}. Do you wish to continue?", 0xFFC000, 420, 280, RemoveLoginIPs_Callback, a ) );
break;
}
@ -2735,7 +2735,7 @@ namespace Server.Gumps
if ( m_PageType == AdminGumpPage.AccountDetails_Access_ClientIPs )
{
from.SendGump( new WarningGump( 1060635, 30720,
$"You are about to firewall {m_List[index]}. All connection attempts from a matching IP will be refused. Are you sure?", 0xFFC000, 420, 280, new WarningGumpCallback( Firewall_Callback ), new[]{ a, m_List[index] } ) );
$"You are about to firewall {m_List[index]}. All connection attempts from a matching IP will be refused. Are you sure?", 0xFFC000, 420, 280, Firewall_Callback, new[]{ a, m_List[index] } ) );
}
else if ( m_PageType == AdminGumpPage.AccountDetails_Access_Restrictions )
{
@ -2796,7 +2796,7 @@ namespace Server.Gumps
break;
from.SendGump( new WarningGump( 1060635, 30720,
$"You are about to remove address {ip} from account {a}. Do you wish to continue?", 0xFFC000, 420, 280, new WarningGumpCallback( RemoveLoginIP_Callback ), new object[] { a, ip } ) );
$"You are about to remove address {ip} from account {a}. Do you wish to continue?", 0xFFC000, 420, 280, RemoveLoginIP_Callback, new object[] { a, ip } ) );
}
}

4
Scripts/Gumps/CommentsGump.cs
View file

@ -12,7 +12,7 @@ namespace Server.Gumps
{
public static void Initialize()
{
CommandSystem.Register( "Comments", AccessLevel.Counselor, new CommandEventHandler( Comments_OnCommand ) );
CommandSystem.Register( "Comments", AccessLevel.Counselor, Comments_OnCommand );
}
[Usage( "Comments" )]
@ -20,7 +20,7 @@ namespace Server.Gumps
private static void Comments_OnCommand( CommandEventArgs args )
{
args.Mobile.SendMessage( "Select the player to view account comments." );
args.Mobile.BeginTarget( -1, false, TargetFlags.None, new TargetCallback( OnTarget ) );
args.Mobile.BeginTarget( -1, false, TargetFlags.None, OnTarget );
}
private static void OnTarget( Mobile from, object target )

2
Scripts/Gumps/Guilds/New Guild System/DiplomacyGump.cs
View file

@ -274,7 +274,7 @@ namespace Server.Guilds
return;
if ( AllowAdvancedSearch && info.ButtonID == 8 )
pm.SendGump( new GuildAdvancedSearchGump( pm, guild, m_Display, new SearchSelectionCallback( AdvancedSearch_Callback ) ));
pm.SendGump( new GuildAdvancedSearchGump( pm, guild, m_Display, AdvancedSearch_Callback ));
}

4
Scripts/Gumps/Guilds/New Guild System/GuildInfoGump.cs
View file

@ -103,7 +103,7 @@ namespace Server.Guilds
{
pm.SendLocalizedMessage( 1013071 ); // Enter the new guild charter (50 characters max):
pm.BeginPrompt( new PromptCallback( SetCharter_Callback ), true ); //Have the same callback handle both canceling and deletion cause the 2nd callback would just get a text of ""
pm.BeginPrompt( SetCharter_Callback, true ); //Have the same callback handle both canceling and deletion cause the 2nd callback would just get a text of ""
}
break;
}
@ -112,7 +112,7 @@ namespace Server.Guilds
if ( IsLeader( pm, guild ) )
{
pm.SendLocalizedMessage( 1013072 ); // Enter the new website for the guild (50 characters max):
pm.BeginPrompt( new PromptCallback( SetWebsite_Callback ), true ); //Have the same callback handle both canceling and deletion cause the 2nd callback would just get a text of ""
pm.BeginPrompt( SetWebsite_Callback, true ); //Have the same callback handle both canceling and deletion cause the 2nd callback would just get a text of ""
}
break;
}

2
Scripts/Gumps/Guilds/New Guild System/GuildMemberInfoGump.cs
View file

@ -127,7 +127,7 @@ namespace Server.Guilds
{
pm.SendLocalizedMessage( 1011128 ); // Enter the new title for this guild member or 'none' to remove a title:
pm.BeginPrompt( new PromptCallback( SetTitle_Callback ) );
pm.BeginPrompt( SetTitle_Callback );
}
else if ( m_Member.GuildTitle == null || m_Member.GuildTitle.Length <= 0 )
{

2
Scripts/Gumps/Guilds/New Guild System/OtherGuildInfo.cs
View file

@ -411,7 +411,7 @@ namespace Server.Guilds
else
{
pm.SendLocalizedMessage( 1063439 ); // Enter a name for the new alliance:
pm.BeginPrompt( new PromptCallback( CreateAlliance_Callback ) );
pm.BeginPrompt( CreateAlliance_Callback );
}
}
#endregion

26
Scripts/Gumps/HouseGumpAOS.cs
View file

@ -956,7 +956,7 @@ namespace Server.Gumps
case 3: // Clear Co-Owner List
{
if ( isOwner )
from.SendGump( new WarningGump( 1060635, 30720, 1060736, 32512, 420, 280, new WarningGumpCallback( ClearCoOwners_Callback ), m_House ) );
from.SendGump( new WarningGump( 1060635, 30720, 1060736, 32512, 420, 280, ClearCoOwners_Callback, m_House ) );
break;
}
@ -986,7 +986,7 @@ namespace Server.Gumps
case 7: // Clear Friend List
{
if ( isCoOwner )
from.SendGump( new WarningGump( 1060635, 30720, 1018039, 32512, 420, 280, new WarningGumpCallback( ClearFriends_Callback ), m_House ) );
from.SendGump( new WarningGump( 1060635, 30720, 1018039, 32512, 420, 280, ClearFriends_Callback, m_House ) );
break;
}
@ -998,7 +998,7 @@ namespace Server.Gumps
}
case 9: // Clear Ban List
{
from.SendGump( new WarningGump( 1060635, 30720, 1060753, 32512, 420, 280, new WarningGumpCallback( ClearBans_Callback ), m_House ) );
from.SendGump( new WarningGump( 1060635, 30720, 1060753, 32512, 420, 280, ClearBans_Callback, m_House ) );
break;
}
@ -1010,7 +1010,7 @@ namespace Server.Gumps
}
case 11: // Clear Access List
{
from.SendGump( new WarningGump( 1060635, 30720, 1061842, 32512, 420, 280, new WarningGumpCallback( ClearAccess_Callback ), m_House ) );
from.SendGump( new WarningGump( 1060635, 30720, 1061842, 32512, 420, 280, ClearAccess_Callback, m_House ) );
break;
}
@ -1021,14 +1021,14 @@ namespace Server.Gumps
if ( m_House.PlayerVendors.Count > 0 )
{
// You have vendors working out of this building. It cannot be declared private until there are no vendors in place.
from.SendGump( new NoticeGump( 1060637, 30720, 501887, 32512, 320, 180, new NoticeGumpCallback( PublicPrivateNotice_Callback ), m_House ) );
from.SendGump( new NoticeGump( 1060637, 30720, 501887, 32512, 320, 180, PublicPrivateNotice_Callback, m_House ) );
break;
}
if ( m_House.VendorRentalContracts.Count > 0 )
{
// You cannot currently take this action because you have vendor contracts locked down in your home. You must remove them first.
from.SendGump( new NoticeGump( 1060637, 30720, 1062351, 32512, 320, 180, new NoticeGumpCallback( PublicPrivateNotice_Callback ), m_House ) );
from.SendGump( new NoticeGump( 1060637, 30720, 1062351, 32512, 320, 180, PublicPrivateNotice_Callback, m_House ) );
break;
}
@ -1037,7 +1037,7 @@ namespace Server.Gumps
m_House.ChangeLocks( from );
// This house is now private.
from.SendGump( new NoticeGump( 1060637, 30720, 501888, 32512, 320, 180, new NoticeGumpCallback( PublicPrivateNotice_Callback ), m_House ) );
from.SendGump( new NoticeGump( 1060637, 30720, 501888, 32512, 320, 180, PublicPrivateNotice_Callback, m_House ) );
Region r = m_House.Region;
List<Mobile> list = r.GetMobiles();
@ -1065,11 +1065,11 @@ namespace Server.Gumps
if ( BaseHouse.NewVendorSystem )
{
// This house is now public. The owner may now place vendors and vendor rental contracts.
from.SendGump( new NoticeGump( 1060637, 30720, 501886, 32512, 320, 180, new NoticeGumpCallback( PublicPrivateNotice_Callback ), m_House ) );
from.SendGump( new NoticeGump( 1060637, 30720, 501886, 32512, 320, 180, PublicPrivateNotice_Callback, m_House ) );
}
else
{
from.SendGump( new NoticeGump( 1060637, 30720, "This house is now public. Friends of the house may now have vendors working out of this building.", 0xF8C000, 320, 180, new NoticeGumpCallback( PublicPrivateNotice_Callback ), m_House ) );
from.SendGump( new NoticeGump( 1060637, 30720, "This house is now public. Friends of the house may now have vendors working out of this building.", 0xF8C000, 320, 180, PublicPrivateNotice_Callback, m_House ) );
}
Region r = m_House.Region;
@ -1101,7 +1101,7 @@ namespace Server.Gumps
if ( m_House.HasRentedVendors )
{
// You cannot perform this action while you still have vendors rented out in this house.
from.SendGump( new NoticeGump( 1060637, 30720, 1062395, 32512, 320, 180, new NoticeGumpCallback( CustomizeNotice_Callback ), m_House ) );
from.SendGump( new NoticeGump( 1060637, 30720, 1062395, 32512, 320, 180, CustomizeNotice_Callback, m_House ) );
}
else
{
@ -1117,7 +1117,7 @@ namespace Server.Gumps
* Your house will be leveled to its foundation, and you will be able to build new walls, windows, doors, and stairs.
* Are you sure you wish to continue?
*/
from.SendGump( new WarningGump( 1060635, 30720, 1060013, 32512, 420, 280, new WarningGumpCallback( ConvertHouse_Callback ), m_House ) );
from.SendGump( new WarningGump( 1060635, 30720, 1060013, 32512, 420, 280, ConvertHouse_Callback, m_House ) );
}
}
}
@ -1131,14 +1131,14 @@ namespace Server.Gumps
if ( m_House.HasRentedVendors )
{
// You cannot perform this action while you still have vendors rented out in this house.
from.SendGump( new NoticeGump( 1060637, 30720, 1062395, 32512, 320, 180, new NoticeGumpCallback( CustomizeNotice_Callback ), m_House ) );
from.SendGump( new NoticeGump( 1060637, 30720, 1062395, 32512, 320, 180, CustomizeNotice_Callback, m_House ) );
}
#region Mondain's Legacy
else if ( m_House.HasAddonContainers )
{
// The house can not be customized when add-on containers such as aquariums, elven furniture containers, vanities, and boiling cauldrons
// are present in the house. Please re-deed the add-on containers before customizing the house.
from.SendGump( new NoticeGump( 1060637, 30720, 1074863, 32512, 320, 180, new NoticeGumpCallback( CustomizeNotice_Callback ), m_House ) );
from.SendGump( new NoticeGump( 1060637, 30720, 1074863, 32512, 320, 180, CustomizeNotice_Callback, m_House ) );
}
#endregion
else

2
Scripts/Gumps/ReportMurderer.cs
View file

@ -14,7 +14,7 @@ namespace Server.Gumps
public static void Initialize()
{
EventSink.PlayerDeath += new PlayerDeathEventHandler( EventSink_PlayerDeath );
EventSink.PlayerDeath += EventSink_PlayerDeath;
}
public static void EventSink_PlayerDeath( PlayerDeathEventArgs e )

2
Scripts/Gumps/ToTAdminGump.cs
View file

@ -117,7 +117,7 @@ namespace Server.Gumps
public static void Initialize()
{
CommandSystem.Register( "ToTAdmin", AccessLevel.Administrator, new CommandEventHandler( ToTAdmin_OnCommand ) );
CommandSystem.Register( "ToTAdmin", AccessLevel.Administrator, ToTAdmin_OnCommand );
}
[Usage( "ToTAdmin" )]

4
Scripts/Gumps/ViewHousesGump.cs
View file

@ -12,14 +12,14 @@ namespace Server.Gumps
{
public static void Initialize()
{
CommandSystem.Register( "ViewHouses", AccessLevel.GameMaster, new CommandEventHandler( ViewHouses_OnCommand ) );
CommandSystem.Register( "ViewHouses", AccessLevel.GameMaster, ViewHouses_OnCommand );
}
[Usage( "ViewHouses" )]
[Description( "Displays a menu listing all houses of a targeted player. The menu also contains specific house details, and options to: go to house, open house menu, and demolish house." )]
public static void ViewHouses_OnCommand( CommandEventArgs e )
{
e.Mobile.BeginTarget( -1, false, TargetFlags.None, new TargetCallback( ViewHouses_OnTarget ) );
e.Mobile.BeginTarget( -1, false, TargetFlags.None, ViewHouses_OnTarget );
}
public static void ViewHouses_OnTarget( Mobile from, object targeted )

4
Scripts/Gumps/WhoGump.cs
View file

@ -10,8 +10,8 @@ namespace Server.Gumps
{
public static void Initialize()
{
CommandSystem.Register( "Who", AccessLevel.Counselor, new CommandEventHandler( WhoList_OnCommand ) );
CommandSystem.Register( "WhoList", AccessLevel.Counselor, new CommandEventHandler( WhoList_OnCommand ) );
CommandSystem.Register( "Who", AccessLevel.Counselor, WhoList_OnCommand );
CommandSystem.Register( "WhoList", AccessLevel.Counselor, WhoList_OnCommand );
}
[Usage( "WhoList [filter]" )]