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

Fixes more casting

Browse source
This commit is contained in:
Kamron Batman 2018-08-19 11:04:07 +08:00
parent 61937d9c97
commit e77d695684
91 changed files with 512 additions and 908 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Scripts/Gumps/Guilds/GuildChangeTypeGump.cs
View file

@ -80,8 +80,8 @@ namespace Server.Gumps
if ( Guild.NewGuildSystem )
{
if ( m_Mobile is PlayerMobile )
m_Mobile.SendGump( new GuildInfoGump( (PlayerMobile)m_Mobile, m_Guild ) );
if ( m_Mobile is PlayerMobile mobile )
mobile.SendGump( new GuildInfoGump( mobile, m_Guild ) );
return;
}

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

@ -51,9 +51,7 @@ namespace Server.Guilds
{
base.OnResponse( sender, info );
PlayerMobile pm = sender.Mobile as PlayerMobile;
if ( pm == null || !IsMember( pm, guild ) )
if ( !(sender.Mobile is PlayerMobile pm) || !IsMember( pm, guild ) )
return;
GuildDisplayType display = m_Display;

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

@ -139,9 +139,7 @@ namespace Server.Guilds
{
base.OnResponse( sender, info );
PlayerMobile pm = sender.Mobile as PlayerMobile;
if ( pm == null || !IsMember( pm, guild ) )
if ( !(sender.Mobile is PlayerMobile pm) || !IsMember( pm, guild ) )
return;
int id = info.ButtonID;

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

@ -43,9 +43,7 @@ namespace Server.Guilds
public override void OnResponse( NetState sender, RelayInfo info )
{
PlayerMobile pm = sender.Mobile as PlayerMobile;
if ( pm == null || pm.Guild != null )
if ( !(sender.Mobile is PlayerMobile pm) || pm.Guild != null )
return; //Sanity
switch( info.ButtonID )

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

@ -272,9 +272,7 @@ namespace Server.Guilds
{
base.OnResponse( sender, info );
PlayerMobile pm = sender.Mobile as PlayerMobile;
if ( pm == null || !IsMember( pm, guild ) )
if ( !(sender.Mobile is PlayerMobile pm) || !IsMember( pm, guild ) )
return;
if ( AllowAdvancedSearch && info.ButtonID == 8 )

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

@ -62,9 +62,7 @@ namespace Server.Guilds
public override void OnResponse( NetState sender, RelayInfo info )
{
PlayerMobile pm = sender.Mobile as PlayerMobile;
if ( pm == null || !IsMember( pm, guild ) || !IsMember( m_Member, guild ) )
if ( !(sender.Mobile is PlayerMobile pm) || !IsMember( pm, guild ) || !IsMember( m_Member, guild ) )
return;
RankDefinition playerRank = pm.GuildRank;
@ -192,15 +190,10 @@ namespace Server.Guilds
public void SetTitle_Callback( Mobile from, string text )
{
PlayerMobile pm = from as PlayerMobile;
PlayerMobile targ = m_Member;
if ( pm == null || targ == null )
if (!(from is PlayerMobile pm) || m_Member == null )
return;
Guild g = targ.Guild as Guild;
if ( g == null || !IsMember( pm, g ) || !(pm.GuildRank.GetFlag( RankFlags.CanSetGuildTitle ) && (pm.GuildRank.Rank > targ.GuildRank.Rank || pm == targ)) )
if ( !(m_Member.Guild is Guild g) || !IsMember( pm, g ) || !(pm.GuildRank.GetFlag( RankFlags.CanSetGuildTitle ) && (pm.GuildRank.Rank > m_Member.GuildRank.Rank || pm == m_Member)) )
{
if ( m_Member.GuildTitle == null || m_Member.GuildTitle.Length <= 0 )
pm.SendLocalizedMessage( 1070746 ); // You don't have the permission to set that member's guild title.
@ -220,11 +213,11 @@ namespace Server.Guilds
else
{
if ( Insensitive.Equals( title, "none" ) )
targ.GuildTitle = null;
m_Member.GuildTitle = null;
else
targ.GuildTitle = title;
m_Member.GuildTitle = title;
pm.SendLocalizedMessage( 1063156, targ.Name ); // The guild information for ~1_val~ has been updated.
pm.SendLocalizedMessage( 1063156, m_Member.Name ); // The guild information for ~1_val~ has been updated.
}
}
}

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

@ -182,9 +182,7 @@ namespace Server.Guilds
{
base.OnResponse( sender, info );
PlayerMobile pm = sender.Mobile as PlayerMobile;
if ( pm == null || !IsMember( pm, guild ) )
if ( !(sender.Mobile is PlayerMobile pm) || !IsMember( pm, guild ) )
return;
if ( info.ButtonID == 8 )

10
Scripts/Gumps/Guilds/RecruitTarget.cs
View file

@ -22,15 +22,13 @@ namespace Server.Gumps
if ( GuildGump.BadMember( m_Mobile, m_Guild ) )
return;
if ( targeted is Mobile )
if ( targeted is Mobile m )
{
Mobile m = (Mobile)targeted;
PlayerState guildState = PlayerState.Find( m_Guild.Leader );
PlayerState targetState = PlayerState.Find( m );
Faction guildFaction = ( guildState == null ? null : guildState.Faction );
Faction targetFaction = ( targetState == null ? null : targetState.Faction );
Faction guildFaction = guildState?.Faction;
Faction targetFaction = targetState?.Faction;
if ( !m.Player )
{
@ -92,4 +90,4 @@ namespace Server.Gumps
m_Mobile.SendGump( new GuildGump( m_Mobile, m_Guild ) );
}
}
}
}