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

Fixes casting, default parameters and null propogation in more files.

Browse source
This commit is contained in:
Kamron Batman 2018-09-09 22:05:44 -07:00
parent 067dca8393
commit 403e2a8b9d
21 changed files with 328 additions and 523 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Scripts/Misc/Titles.cs
View file

@ -67,9 +67,11 @@ namespace Server.Misc
public static void AwardKarma( Mobile m, int offset, bool message )
{
PlayerMobile pm = m as PlayerMobile;
if ( offset > 0 )
{
if ( m is PlayerMobile && ((PlayerMobile)m).KarmaLocked )
if ( pm?.KarmaLocked == true )
return;
if ( m.Karma >= MaxKarma )
@ -120,9 +122,9 @@ namespace Server.Misc
m.SendLocalizedMessage( 1019063 ); // You have lost a little karma.
}
if ( !Core.AOS && wasPositiveKarma && m.Karma < 0 && m is PlayerMobile && !((PlayerMobile)m).KarmaLocked )
if ( !Core.AOS && wasPositiveKarma && m.Karma < 0 && pm != null && !pm.KarmaLocked )
{
((PlayerMobile)m).KarmaLocked = true;
pm.KarmaLocked = true;
m.SendLocalizedMessage( 1042511, "", 0x22 ); // Karma is locked. A mantra spoken at a shrine will unlock it again.
}
}
@ -172,9 +174,9 @@ namespace Server.Misc
title.Append( beheld.Name );
}
if ( beheld is PlayerMobile && ((PlayerMobile)beheld).DisplayChampionTitle )
if ( beheld is PlayerMobile mobile && mobile.DisplayChampionTitle )
{
PlayerMobile.ChampionTitleInfo info = ((PlayerMobile)beheld).ChampionTitles;
PlayerMobile.ChampionTitleInfo info = mobile.ChampionTitles;
if ( info.Harrower > 0 )
title.AppendFormat( ": {0} of Evil", HarrowerTitles[Math.Min( HarrowerTitles.Length, info.Harrower )-1] );