From b95170c5455cb007791c9d60a87aa706625f8913 Mon Sep 17 00:00:00 2001
From: mark <mark@a9ff2418-eebe-19e0-0898-3207744d8c45>
Date: Sun, 9 Aug 2009 02:20:57 +0000
Subject: [PATCH]

---
 Scripts/Mobiles/PlayerMobile.cs |  5 ++--
 Server/Timer.cs                 | 48 +++++++++++++++------------------
 2 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/Scripts/Mobiles/PlayerMobile.cs b/Scripts/Mobiles/PlayerMobile.cs
index 4d690dc44..1ea0b92e2 100644
--- a/Scripts/Mobiles/PlayerMobile.cs
+++ b/Scripts/Mobiles/PlayerMobile.cs
@@ -1800,9 +1800,8 @@ namespace Server.Mobiles
 			if ( this.Alive && !wasAlive )
 			{
 				Item deathRobe = new DeathRobe();
-				if ( !this.Backpack.CheckHold( this, deathRobe, false, true ) )
-					deathRobe.Delete();
-				else if ( !EquipItem( deathRobe ) )
+				
+				if ( !EquipItem( deathRobe ) )
 					deathRobe.Delete();
 			}
 		}
diff --git a/Server/Timer.cs b/Server/Timer.cs
index 867b30d92..ae2d97c4a 100644
--- a/Server/Timer.cs
+++ b/Server/Timer.cs
@@ -53,6 +53,7 @@ namespace Server
 		private int m_Index, m_Count;
 		private TimerPriority m_Priority;
 		private List<Timer> m_List;
+		private bool m_PrioritySet;
 
 		private static string FormatDelegate( Delegate callback )
 		{
@@ -75,6 +76,9 @@ namespace Server
 			}
 			set
 			{
+				if ( !m_PrioritySet )
+					m_PrioritySet = true;
+
 				if ( m_Priority != value )
 				{
 					m_Priority = value;
@@ -92,42 +96,23 @@ namespace Server
 
 		public TimeSpan Delay
 		{
-			get
-			{
-				return m_Delay;
-			}
-			set
-			{
-				m_Delay = value;
-			}
+			get { return m_Delay; }
+			set { m_Delay = value; }
 		}
 
 		public TimeSpan Interval
 		{
-			get
-			{
-				return m_Interval;
-			}
-			set
-			{
-				m_Interval = value;
-			}
+			get { return m_Interval; }
+			set { m_Interval = value; }
 		}
 
 		public bool Running
 		{
-			get
-			{
-				return m_Running;
-			}
-			set
-			{
-				if ( value )
-				{
+			get { return m_Running; }
+			set {
+				if ( value ) {
 					Start();
-				}
-				else
-				{
+				} else {
 					Stop();
 				}
 			}
@@ -437,6 +422,15 @@ namespace Server
 			m_Interval = interval;
 			m_Count = count;
 
+			if ( !m_PrioritySet ) {
+				if ( count == 1 ) {
+					m_Priority = ComputePriority( delay );
+				} else {
+					m_Priority = ComputePriority( interval );
+				}
+				m_PrioritySet = true;
+			}
+
 			if ( DefRegCreation )
 				RegCreation();
 		}