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

Removes implicit this.

Browse source
This commit is contained in:
Kamron Batman 2018-09-14 12:56:58 -07:00
parent 04b4cfe75b
commit 83dcf536d8
533 changed files with 2804 additions and 2806 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Scripts/Gumps/Guilds/GuildAbbrvPrompt.cs
View file

@ -35,7 +35,7 @@ namespace Server.Gumps
if ( text.Length > 0 )
{
if ( Guild.FindByAbbrev( text ) != null )
if ( BaseGuild.FindByAbbrev( text ) != null )
{
m_Mobile.SendMessage( "{0} conflicts with the abbreviation of an existing guild.", text );
}

2
Scripts/Gumps/Guilds/GuildDeclareWarPrompt.cs
View file

@ -33,7 +33,7 @@ namespace Server.Gumps
if ( text.Length >= 3 )
{
List<Guild> guilds = Utility.CastConvertList<BaseGuild, Guild>( Guild.Search( text ) );
List<Guild> guilds = Utility.CastConvertList<BaseGuild, Guild>( BaseGuild.Search( text ) );
GuildGump.EnsureClosed( m_Mobile );

2
Scripts/Gumps/Guilds/GuildGump.cs
View file

@ -179,7 +179,7 @@ namespace Server.Gumps
}
case 5: // Membership candidates
{
GuildGump.EnsureClosed( m_Mobile );
EnsureClosed( m_Mobile );
m_Mobile.SendGump( new GuildCandidatesGump( m_Mobile, m_Guild ) );
break;

2
Scripts/Gumps/Guilds/GuildNamePrompt.cs
View file

@ -35,7 +35,7 @@ namespace Server.Gumps
if ( text.Length > 0 )
{
if ( Guild.FindByName( text ) != null )
if ( BaseGuild.FindByName( text ) != null )
{
m_Mobile.SendMessage( "{0} conflicts with the name of an existing guild.", text );
}

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

@ -61,9 +61,9 @@ namespace Server.Guilds
pm.SendLocalizedMessage( 1063036, Guild.NameLimit.ToString() ); // A guild name cannot be more than ~1_val~ characters in length.
else if ( guildAbbrev.Length > Guild.AbbrevLimit )
pm.SendLocalizedMessage( 1063037, Guild.AbbrevLimit.ToString() ); // An abbreviation cannot exceed ~1_val~ characters in length.
else if ( Guild.FindByAbbrev( guildAbbrev ) != null || !BaseGuildGump.CheckProfanity( guildAbbrev ) )
else if ( BaseGuild.FindByAbbrev( guildAbbrev ) != null || !BaseGuildGump.CheckProfanity( guildAbbrev ) )
pm.SendLocalizedMessage( 501153 ); // That abbreviation is not available.
else if ( Guild.FindByName( guildName ) != null || !BaseGuildGump.CheckProfanity( guildName ) )
else if ( BaseGuild.FindByName( guildName ) != null || !BaseGuildGump.CheckProfanity( guildName ) )
pm.SendLocalizedMessage( 1063000 ); // That guild name is not available.
else if ( !Banker.Withdraw( pm, Guild.RegistrationFee ) )
pm.SendLocalizedMessage( 1063001, Guild.RegistrationFee.ToString() ); // You do not possess the ~1_val~ gold piece fee required to create a guild.

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

@ -105,12 +105,12 @@ namespace Server.Guilds
TextDefinition m_LowerText;
public GuildDiplomacyGump( PlayerMobile pm, Guild g )
: this( pm, g, GuildDiplomacyGump.NameComparer.Instance, true, "", 0, GuildDisplayType.All, Utility.CastConvertList<BaseGuild, Guild>( new List<BaseGuild>( Guild.List.Values ) ), (1063136 + (int)GuildDisplayType.All) )
: this( pm, g, NameComparer.Instance, true, "", 0, GuildDisplayType.All, Utility.CastConvertList<BaseGuild, Guild>( new List<BaseGuild>( BaseGuild.List.Values ) ), (1063136 + (int)GuildDisplayType.All) )
{
}
public GuildDiplomacyGump( PlayerMobile pm, Guild g, IComparer<Guild> currentComparer, bool ascending, string filter, int startNumber, GuildDisplayType display )
: this( pm, g, currentComparer, ascending, filter, startNumber, display, Utility.CastConvertList<BaseGuild, Guild>( new List<BaseGuild>( Guild.List.Values ) ), (1063136 + (int)display) )
: this( pm, g, currentComparer, ascending, filter, startNumber, display, Utility.CastConvertList<BaseGuild, Guild>( new List<BaseGuild>( BaseGuild.List.Values ) ), (1063136 + (int)display) )
{
}
@ -120,7 +120,7 @@ namespace Server.Guilds
}
public GuildDiplomacyGump( PlayerMobile pm, Guild g, bool ascending, string filter, int startNumber, List<Guild> list, TextDefinition lowerText )
: this( pm, g, GuildDiplomacyGump.NameComparer.Instance, ascending, filter, startNumber, GuildDisplayType.All, list, lowerText )
: this( pm, g, NameComparer.Instance, ascending, filter, startNumber, GuildDisplayType.All, list, lowerText )
{
}
@ -128,9 +128,9 @@ namespace Server.Guilds
: base( pm, g, list, currentComparer, ascending, filter, startNumber,
new[]
{
new InfoField<Guild>( 1062954, 280, GuildDiplomacyGump.NameComparer.Instance ), //Guild Name
new InfoField<Guild>( 1062957, 50, GuildDiplomacyGump.AbbrevComparer.Instance ), //Abbrev
new InfoField<Guild>( 1062958, 120, new GuildDiplomacyGump.StatusComparer( g ) ) //Guild Title
new InfoField<Guild>( 1062954, 280, NameComparer.Instance ), //Guild Name
new InfoField<Guild>( 1062957, 50, AbbrevComparer.Instance ), //Abbrev
new InfoField<Guild>( 1062958, 120, new StatusComparer( g ) ) //Guild Title
})
{

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

@ -204,7 +204,7 @@ namespace Server.Guilds
if ( title.Length > 20 )
from.SendLocalizedMessage( 501178 ); // That title is too long.
else if ( !BaseGuildGump.CheckProfanity( title ) )
else if ( !CheckProfanity( title ) )
from.SendLocalizedMessage( 501179 ); // That title is disallowed.
else
{

10
Scripts/Gumps/Guilds/New Guild System/GuildRosterGump.cs
View file

@ -108,13 +108,13 @@ namespace Server.Guilds
private static InfoField<PlayerMobile>[] m_Fields =
new[]
{
new InfoField<PlayerMobile>( 1062955, 130, GuildRosterGump.NameComparer.Instance ), //Name
new InfoField<PlayerMobile>( 1062956, 80, GuildRosterGump.RankComparer.Instance ), //Rank
new InfoField<PlayerMobile>( 1062952, 80, GuildRosterGump.LastOnComparer.Instance), //Last On
new InfoField<PlayerMobile>( 1062953, 150, GuildRosterGump.TitleComparer.Instance ) //Guild Title
new InfoField<PlayerMobile>( 1062955, 130, NameComparer.Instance ), //Name
new InfoField<PlayerMobile>( 1062956, 80, RankComparer.Instance ), //Rank
new InfoField<PlayerMobile>( 1062952, 80, LastOnComparer.Instance), //Last On
new InfoField<PlayerMobile>( 1062953, 150, TitleComparer.Instance ) //Guild Title
};
public GuildRosterGump( PlayerMobile pm, Guild g ) : this( pm, g, GuildRosterGump.LastOnComparer.Instance, false, "", 0 )
public GuildRosterGump( PlayerMobile pm, Guild g ) : this( pm, g, LastOnComparer.Instance, false, "", 0 )
{
}

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

@ -614,7 +614,7 @@ namespace Server.Guilds
{
string name = Utility.FixHtml( text.Trim() );
if ( !BaseGuildGump.CheckProfanity( name ) )
if ( !CheckProfanity( name ) )
pm.SendLocalizedMessage( 1070886 ); // That alliance name is not allowed.
else if ( name.Length > Guild.NameLimit )
pm.SendLocalizedMessage( 1070887, Guild.NameLimit.ToString() ); // An alliance name cannot exceed ~1_val~ characters in length.