- Added: New method to GameLiving, InCombatInLast(milliseconds).

GameServer/gameobjects/GameLiving.cs

@@ -1182,6 +1182,24 @@ public virtual bool InCombat
 			}
 		}
 
+        /// <summary>
+        /// Check this flag to see if this living has been involved in combat in the given milliseconds
+        /// </summary>
+        public virtual bool InCombatInLast(int milliseconds)
+        {
+            if ((InCombatPvEInLast(milliseconds) || InCombatPvPInLast(milliseconds)) == false)
+            {
+                if (Attackers.Count > 0)
+                {
+                    Attackers.Clear();
+                }
+
+                return false;
+            }
+
+            return true;
+        }
+
 		/// <summary>
 		/// checks if the living is involved in pvp combat
 		/// </summary>
@@ -1200,6 +1218,21 @@ public virtual bool InCombatPvP
 			}
 		}
 
+        /// <summary>
+        /// checks if the living is involved in pvp combat in the given milliseconds
+        /// </summary>
+        public virtual bool InCombatPvPInLast(int milliseconds)
+        {
+            Region region = CurrentRegion;
+            if (region == null)
+                return false;
+
+            if (LastCombatTickPvP == 0)
+                return false;
+
+            return LastCombatTickPvP + milliseconds >= region.Time;
+        }
+
 		/// <summary>
 		/// checks if the living is involved in pve combat
 		/// </summary>
@@ -1221,6 +1254,24 @@ public virtual bool InCombatPvE
 			}
 		}
 
+        /// <summary>
+        /// checks if the living is involved in pve combat in the given milliseconds
+        /// </summary>
+        public virtual bool InCombatPvEInLast(int milliseconds)
+        {
+            Region region = CurrentRegion;
+            if (region == null)
+                return false;
+
+            if (LastCombatTickPvE == 0)
+                return false;
+
+            //if (LastCombatTickPvE + 10000 - region.Time > 0 && this is GameNPC && (this as GameNPC).Brain is IControlledBrain)
+            //	log.Debug(Name + " in combat " + (LastCombatTickPvE + 10000 - region.Time));
+
+            return LastCombatTickPvE + milliseconds >= region.Time;
+        }
+
 		/// <summary>
 		/// Returns the amount of experience this living is worth
 		/// </summary>