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

14
Scripts/Mobiles/Vendors/NPC/Guildmasters/BaseGuildmaster.cs
View file

@ -47,14 +47,14 @@ namespace Server.Mobiles
public virtual bool WasNamed( string speech )
{
string name = this.Name;
string name = Name;
return ( name != null && Insensitive.StartsWith( speech, name ) );
}
public override bool HandlesOnSpeech( Mobile from )
{
if ( from.InRange( this.Location, 2 ) )
if ( from.InRange( Location, 2 ) )
return true;
return base.HandlesOnSpeech( from );
@ -64,13 +64,13 @@ namespace Server.Mobiles
{
Mobile from = e.Mobile;
if ( !e.Handled && from is PlayerMobile && from.InRange( this.Location, 2 ) && WasNamed( e.Speech ) )
if ( !e.Handled && from is PlayerMobile && from.InRange( Location, 2 ) && WasNamed( e.Speech ) )
{
PlayerMobile pm = (PlayerMobile)from;
if ( e.HasKeyword( 0x0004 ) ) // *join* | *member*
{
if ( pm.NpcGuild == this.NpcGuild )
if ( pm.NpcGuild == NpcGuild )
SayTo( from, 501047 ); // Thou art already a member of our guild.
else if ( pm.NpcGuild != NpcGuild.None )
SayTo( from, 501046 ); // Thou must resign from thy other guild first.
@ -83,7 +83,7 @@ namespace Server.Mobiles
}
else if ( e.HasKeyword( 0x0005 ) ) // *resign* | *quit*
{
if ( pm.NpcGuild != this.NpcGuild )
if ( pm.NpcGuild != NpcGuild )
{
SayTo( from, 501052 ); // Thou dost not belong to my guild!
}
@ -110,7 +110,7 @@ namespace Server.Mobiles
{
PlayerMobile pm = (PlayerMobile)from;
if ( pm.NpcGuild == this.NpcGuild )
if ( pm.NpcGuild == NpcGuild )
{
SayTo( from, 501047 ); // Thou art already a member of our guild.
}
@ -126,7 +126,7 @@ namespace Server.Mobiles
{
SayWelcomeTo( from );
pm.NpcGuild = this.NpcGuild;
pm.NpcGuild = NpcGuild;
pm.NpcGuildJoinTime = DateTime.UtcNow;
pm.NpcGuildGameTime = pm.GameTime;