Fix soul lantern soul drain part 2

UONelderim · Nov 7, 2024 · f40d379 · f40d379
1 parent 191b9c1
commit f40d379
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Scripts/Items/Weapons/BaseWeapon.cs b/Scripts/Items/Weapons/BaseWeapon.cs
@@ -598,7 +598,7 @@ public override bool CheckConflictingLayer( Mobile m, Item item, Layer layer )
                 m.SendLocalizedMessage( 500214 ); // You already have something in both hands.
                 return true;
             }
-            else if ( this.Layer == Layer.OneHanded && layer == Layer.TwoHanded && !(item is BaseShield) && !(item is BaseEquipableLight) )
+            else if ( this.Layer == Layer.OneHanded && layer == Layer.TwoHanded && !(item is BaseShield) && !(item is BaseEquipableLight) && !(item is SoulLantern) )
             {
                 m.SendLocalizedMessage( 500215 ); // You can only wield one weapon at a time.
                 return true;

diff --git a/Scripts/Nelderim/Complete Spell System/-=+ 03 Systems/Death Knight/DeathKnightSpell.cs b/Scripts/Nelderim/Complete Spell System/-=+ 03 Systems/Death Knight/DeathKnightSpell.cs
@@ -156,7 +156,12 @@ public static int ComputePowerValue( Mobile from, int div )
 
 		private static SoulLantern FindSoulLantern(Mobile from)
 		{
-			return (SoulLantern)from.Items.FirstOrDefault(i => i is SoulLantern soulLantern && soulLantern.Owner == from);
+			var item = from.FindItemOnLayer(Layer.TwoHanded) as SoulLantern;
+			if (item == null)
+			{
+				item = from.Backpack.FindItemByType<SoulLantern>(true);
+			}
+			return item;
 		}
 
 		private static void DrainSoulsInLantern( Mobile from, int tithing )