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

fix(mobile): Make Criminal virtual and expose ExpireCriminalTimer property (#579)

Browse source
This commit is contained in:
Michael Whelehan 2021-04-20 10:05:05 +02:00 • committed by GitHub
parent e545cdd81c
commit 421d852991
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Projects/Server/Mobiles/Mobile.cs
View file

@ -494,7 +494,6 @@ namespace Server
private Timer m_ExpireAggrTimer; private Timer m_ExpireAggrTimer;
private Timer m_ExpireCombatant; private Timer m_ExpireCombatant;
private Timer m_ExpireCriminal;
private FacialHairInfo m_FacialHair; private FacialHairInfo m_FacialHair;
private int m_Fame, m_Karma; private int m_Fame, m_Karma;
private bool m_Female, m_Warmode, m_Hidden, m_Blessed, m_Flying; private bool m_Female, m_Warmode, m_Hidden, m_Blessed, m_Flying;
@ -1889,8 +1888,10 @@ namespace Server
} }
} }
public Timer ExpireCriminalTimer { get; set; }
[CommandProperty(AccessLevel.Counselor, AccessLevel.GameMaster)] [CommandProperty(AccessLevel.Counselor, AccessLevel.GameMaster)]
public bool Criminal public virtual bool Criminal
{ {
get => m_Criminal; get => m_Criminal;
set set
@ -1904,21 +1905,21 @@ namespace Server
if (m_Criminal) if (m_Criminal)
{ {
if (m_ExpireCriminal == null) if (ExpireCriminalTimer == null)
{ {
m_ExpireCriminal = Timer.DelayCall(ExpireCriminalDelay, ExpireCriminal); ExpireCriminalTimer = Timer.DelayCall(ExpireCriminalDelay, ExpireCriminal);
} }
else else
{ {
m_ExpireCriminal.Stop(); ExpireCriminalTimer.Stop();
} }
m_ExpireCriminal.Start(); ExpireCriminalTimer.Start();
} }
else if (m_ExpireCriminal != null) else if (ExpireCriminalTimer != null)
{ {
m_ExpireCriminal.Stop(); ExpireCriminalTimer.Stop();
m_ExpireCriminal = null; ExpireCriminalTimer = null;
} }
} }
} }
@ -4809,7 +4810,7 @@ namespace Server
m_CombatTimer?.Stop(); m_CombatTimer?.Stop();
m_ExpireCombatant?.Stop(); m_ExpireCombatant?.Stop();
m_LogoutTimer?.Stop(); m_LogoutTimer?.Stop();
m_ExpireCriminal?.Stop(); ExpireCriminalTimer?.Stop();
m_WarmodeTimer?.Stop(); m_WarmodeTimer?.Stop();
m_ParaTimer?.Stop(); m_ParaTimer?.Stop();
m_FrozenTimer?.Stop(); m_FrozenTimer?.Stop();
@ -6567,8 +6568,8 @@ namespace Server
if (m_Criminal) if (m_Criminal)
{ {
m_ExpireCriminal ??= Timer.DelayCall(ExpireCriminalDelay, ExpireCriminal); ExpireCriminalTimer ??= Timer.DelayCall(ExpireCriminalDelay, ExpireCriminal);
m_ExpireCriminal.Start(); ExpireCriminalTimer.Start();
} }
if (ShouldCheckStatTimers) if (ShouldCheckStatTimers)