From 421d852991070796d4ec32dfd474213523e7a1ef Mon Sep 17 00:00:00 2001
From: Michael Whelehan <michael.marula+1@gmail.com>
Date: Tue, 20 Apr 2021 10:05:05 +0200
Subject: [PATCH] fix(mobile): Make Criminal virtual and expose
 ExpireCriminalTimer property (#579)

---
 Projects/Server/Mobiles/Mobile.cs | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/Projects/Server/Mobiles/Mobile.cs b/Projects/Server/Mobiles/Mobile.cs
index 462182d20..c63269b57 100644
--- a/Projects/Server/Mobiles/Mobile.cs
+++ b/Projects/Server/Mobiles/Mobile.cs
@@ -494,7 +494,6 @@ namespace Server
 
         private Timer m_ExpireAggrTimer;
         private Timer m_ExpireCombatant;
-        private Timer m_ExpireCriminal;
         private FacialHairInfo m_FacialHair;
         private int m_Fame, m_Karma;
         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)]
-        public bool Criminal
+        public virtual bool Criminal
         {
             get => m_Criminal;
             set
@@ -1904,21 +1905,21 @@ namespace Server
 
                 if (m_Criminal)
                 {
-                    if (m_ExpireCriminal == null)
+                    if (ExpireCriminalTimer == null)
                     {
-                        m_ExpireCriminal = Timer.DelayCall(ExpireCriminalDelay, ExpireCriminal);
+                        ExpireCriminalTimer = Timer.DelayCall(ExpireCriminalDelay, ExpireCriminal);
                     }
                     else
                     {
-                        m_ExpireCriminal.Stop();
+                        ExpireCriminalTimer.Stop();
                     }
 
-                    m_ExpireCriminal.Start();
+                    ExpireCriminalTimer.Start();
                 }
-                else if (m_ExpireCriminal != null)
+                else if (ExpireCriminalTimer != null)
                 {
-                    m_ExpireCriminal.Stop();
-                    m_ExpireCriminal = null;
+                    ExpireCriminalTimer.Stop();
+                    ExpireCriminalTimer = null;
                 }
             }
         }
@@ -4809,7 +4810,7 @@ namespace Server
             m_CombatTimer?.Stop();
             m_ExpireCombatant?.Stop();
             m_LogoutTimer?.Stop();
-            m_ExpireCriminal?.Stop();
+            ExpireCriminalTimer?.Stop();
             m_WarmodeTimer?.Stop();
             m_ParaTimer?.Stop();
             m_FrozenTimer?.Stop();
@@ -6567,8 +6568,8 @@ namespace Server
 
                         if (m_Criminal)
                         {
-                            m_ExpireCriminal ??= Timer.DelayCall(ExpireCriminalDelay, ExpireCriminal);
-                            m_ExpireCriminal.Start();
+                            ExpireCriminalTimer ??= Timer.DelayCall(ExpireCriminalDelay, ExpireCriminal);
+                            ExpireCriminalTimer.Start();
                         }
 
                         if (ShouldCheckStatTimers)