Fixes parent references. (#15)

Scripts/Engines/BulkOrders/Books/BulkOrderBook.cs

@@ -142,7 +142,7 @@ namespace Server.Engines.BulkOrders
 			}
 		}
 
-		public void InvalidateContainers( object parent )
+		public void InvalidateContainers(IEntity parent)
 		{
 			if ( parent is Container c )
 			{

Scripts/Engines/ConPVP/Games/BombingRun.cs

@@ -44,7 +44,7 @@ namespace Server.Engines.ConPVP
 
     public Mobile Thrower{ get; private set; }
 
-    private Mobile FindOwner(object parent)
+    private Mobile FindOwner(IEntity parent)
     {
       if (parent is Item item)
         return item.RootParent as Mobile;

Scripts/Engines/ConPVP/Games/CTF.cs

@@ -455,7 +455,7 @@ namespace Server.Engines.ConPVP
       MoveToWorld(m_TeamInfo.Origin, m_TeamInfo.Game.Facet);
     }
 
-    private Mobile FindOwner(object parent)
+    private Mobile FindOwner(IEntity parent)
     {
       if (parent is Item item)
         return item.RootParent as Mobile;
@@ -1199,4 +1199,4 @@ namespace Server.Engines.ConPVP
       m_FinishTimer = null;
     }
   }
-}
+}

Scripts/Engines/Factions/Items/Sigil.cs

@@ -181,7 +181,7 @@ namespace Server.Factions
       return false;
     }
 
-    private Mobile FindOwner(object parent)
+    private Mobile FindOwner(IEntity parent)
     {
       if (parent is Item item)
         return item.RootParent as Mobile;
@@ -453,4 +453,4 @@ namespace Server.Factions
       base.Delete();
     }
   }
-}
+}

Scripts/Gumps/ViewHousesGump.cs

@@ -234,9 +234,7 @@ namespace Server.Gumps
     public object FindHouseName(BaseHouse house)
     {
       int multiID = house.ItemID;
-      HousePlacementEntry[] entries;
+      HousePlacementEntry[] entries = HousePlacementEntry.ClassicHouses;
-
-      entries = HousePlacementEntry.ClassicHouses;
 
       for (int i = 0; i < entries.Length; ++i)
         if (entries[i].MultiID == multiID)
@@ -288,4 +286,4 @@ namespace Server.Gumps
       }
     }
   }
-}
+}

Scripts/Items/Games/BaseBoard.cs

@@ -114,7 +114,7 @@ namespace Server.Items
       if (board.IsChildOf(from.Backpack))
         return true;
 
-      object root = board.RootParent;
+      IEntity root = board.RootParent;
 
       if (root is Mobile && root != from)
         return false;
@@ -122,9 +122,7 @@ namespace Server.Items
       if (board.Deleted || board.Map != from.Map || !from.InRange(board.GetWorldLocation(), 1))
         return false;
 
-      BaseHouse house = BaseHouse.FindHouseAt(board);
+      return BaseHouse.FindHouseAt(board)?.IsOwner(from) == true;
-
-      return house != null && house.IsOwner(from);
     }
 
     public class DefaultEntry : ContextMenuEntry
@@ -146,4 +144,4 @@ namespace Server.Items
       }
     }
   }
-}
+}

Scripts/Items/Maps/MapItem.cs

@@ -174,12 +174,7 @@ namespace Server.Items
       if (!Movable || Protected || !from.InRange(GetWorldLocation(), 2))
         return false;
 
-      object root = RootParent;
+      return !(RootParent is Mobile && RootParent != from);
-
-      if (root is Mobile && root != from)
-        return false;
-
-      return true;
     }
 
     public void ConvertToWorld(int x, int y, out int worldX, out int worldY)
@@ -381,4 +376,4 @@ namespace Server.Items
       }
     }
   }
-}
+}

Scripts/Items/Misc/Scales.cs

@@ -53,7 +53,7 @@ namespace Server.Items
         }
         else if (targeted is Item item)
         {
-          object root = item.RootParent;
+          IEntity root = item.RootParent;
 
           if (root != null && root != from || item.Parent == from)
           {
@@ -61,10 +61,7 @@ namespace Server.Items
           }
           else if (item.Movable)
           {
-            if (item.Amount > 1)
+            message = item.Amount > 1 ? "You place one item on the scale. " : "You place that item on the scale. ";
-              message = "You place one item on the scale. ";
-            else
-              message = "You place that item on the scale. ";
 
             double weight = item.Weight;
 

Scripts/Items/Skill Items/Magical/Potions/Explosion Potions/BaseExplosionPotion.cs

@@ -45,17 +45,13 @@ namespace Server.Items
       int version = reader.ReadInt();
     }
 
-    public virtual object FindParent(Mobile from)
+    public virtual IEntity FindParent(Mobile from)
     {
-      Mobile m = HeldBy;
+      if (HeldBy?.Holding == this)
+        return HeldBy;
 
-      if (m != null && m.Holding == this)
+      if (RootParent != null)
-        return m;
+        return RootParent;
-
-      object obj = RootParent;
-
-      if (obj != null)
-        return obj;
 
       if (Map == Map.Internal)
         return from;
@@ -74,7 +70,7 @@ namespace Server.Items
       ThrowTarget targ = from.Target as ThrowTarget;
       Stackable = false; // Scavenged explosion potions won't stack with those ones in backpack, and still will explode.
 
-      if (targ != null && targ.Potion == this)
+      if (targ?.Potion == this)
         return;
 
       from.RevealingAction();
@@ -107,7 +103,7 @@ namespace Server.Items
       if (Deleted)
         return;
 
-      object parent = FindParent(from);
+      IEntity parent = FindParent(from);
 
       if (timer == 0)
       {
@@ -272,4 +268,4 @@ namespace Server.Items
       }
     }
   }
-}
+}

Scripts/Items/Suits/BaseSuit.cs

@@ -47,15 +47,12 @@ namespace Server.Items
 
     public bool Validate()
     {
-      object root = RootParent;
+      if (!(RootParent is Mobile mobile) || mobile.AccessLevel >= AccessLevel)
+        return true;
 
-      if (root is Mobile mobile && mobile.AccessLevel < AccessLevel)
+      Delete();
-      {
+      return false;
-        Delete();
-        return false;
-      }
 
-      return true;
     }
 
     public override void OnSingleClick(Mobile from)
@@ -83,4 +80,4 @@ namespace Server.Items
       return from.AccessLevel >= AccessLevel;
     }
   }
-}
+}

Scripts/Misc/Cleanup.cs

@@ -66,9 +66,7 @@ namespace Server.Misc
         }
         else if (item.Layer == Layer.Hair || item.Layer == Layer.FacialHair)
         {
-          object rootParent = item.RootParent;
+          if (item.RootParent is Mobile rootMobile)
-
-          if (rootParent is Mobile rootMobile)
           {
             if (item.Parent != rootMobile && rootMobile.AccessLevel == AccessLevel.Player)
             {
@@ -164,4 +162,4 @@ namespace Server.Misc
       return false;
     }
   }
-}
+}

Scripts/Skills/Stealing.cs

@@ -79,7 +79,7 @@ namespace Server.SkillHandlers
       {
         Item stolen = null;
 
-        object root = toSteal.RootParent;
+        IEntity root = toSteal.RootParent;
         Mobile mobRoot = root as Mobile;
 
         StealableArtifactsSpawner.StealableInstance si = null;
@@ -215,7 +215,7 @@ namespace Server.SkillHandlers
         {
           m_Thief.SendLocalizedMessage(502710); // You can't steal that!
         }
-        else if (toSteal.LootType == LootType.Newbied || toSteal.CheckBlessed(root))
+        else if (toSteal.LootType == LootType.Newbied || toSteal.CheckBlessed(mobRoot))
         {
           m_Thief.SendLocalizedMessage(502710); // You can't steal that!
         }
@@ -244,7 +244,7 @@ namespace Server.SkillHandlers
         {
           m_Thief.SendLocalizedMessage(502710); // You can't steal that!
         }
-        else if (mobRoot != null && !m_Thief.CanBeHarmful((Mobile)root))
+        else if (mobRoot != null && !m_Thief.CanBeHarmful(mobRoot))
         {
         }
         else if (root is Corpse)
@@ -332,7 +332,7 @@ namespace Server.SkillHandlers
         from.RevealingAction();
 
         Item stolen = null;
-        object root = null;
+        IEntity root = null;
         bool caught = false;
 
         if (target is Item item)
@@ -356,7 +356,7 @@ namespace Server.SkillHandlers
         {
           m_Thief.SendLocalizedMessage(502710); // You can't steal that!
         }
-        
+
         Mobile mobRoot = root as Mobile;
 
         if (stolen != null)
@@ -395,7 +395,7 @@ namespace Server.SkillHandlers
         if (mobRoot?.Player == true && m_Thief is PlayerMobile pm &&
             IsInnocentTo(pm, mobRoot) && !IsInGuild(mobRoot))
         {
-          pm.PermaFlags.Add((Mobile)root);
+          pm.PermaFlags.Add(mobRoot);
           pm.Delta(MobileDelta.Noto);
         }
       }
@@ -484,4 +484,4 @@ namespace Server.SkillHandlers
       }
     }
   }
-}
+}

Scripts/Spells/Base/Spell.cs

@@ -118,7 +118,7 @@ namespace Server.Spells
       return true;
     }
 
-    public virtual bool OnCasterUsingObject(object o)
+    public virtual bool OnCasterUsingObject(IEntity entity)
     {
       if (State == SpellState.Sequencing)
         Disturb(DisturbType.UseRequest);

Scripts/Spells/Third/Telekinesis.cs

@@ -42,8 +42,6 @@ namespace Server.Spells.Third
       {
         SpellHelper.Turn(Caster, item);
 
-        object root = item.RootParent;
-
         if (!item.IsAccessibleTo(Caster))
         {
           item.OnDoubleClickNotAccessible(Caster);
@@ -51,7 +49,7 @@ namespace Server.Spells.Third
         else if (!item.CheckItemUse(Caster, item))
         {
         }
-        else if (root is Mobile && root != Caster)
+        else if (item.RootParent is Mobile && item.RootParent != Caster)
         {
           item.OnSnoop(Caster);
         }
@@ -104,4 +102,4 @@ namespace Server
   {
     void OnTelekinesis(Mobile from);
   }
-}
+}

Server/Interfaces.cs

@@ -84,7 +84,7 @@ namespace Server
     void OnConnectionChanged();
     bool OnCasterMoving(Direction d);
     bool OnCasterEquipping(Item item);
-    bool OnCasterUsingObject(object o);
+    bool OnCasterUsingObject(IEntity entity);
     bool OnCastInTown(Region r);
   }
 
@@ -111,4 +111,4 @@ namespace Server
     void OnBeforeSpawn(Point3D location, Map map);
     void OnAfterSpawn();
   }
-}
+}

Server/Item.cs

@@ -3681,15 +3681,13 @@ namespace Server
           target.Map == null)
         return false;
 
-      object root = target.RootParent;
-
       if (from.AccessLevel < AccessLevel.GameMaster && !from.InRange(target.GetWorldLocation(), 2))
         return false;
       if (!from.CanSee(target) || !from.InLOS(target))
         return false;
       if (!target.IsAccessibleTo(from))
         return false;
-      if (root is Mobile mobile && !mobile.CheckNonlocalDrop(from, this, target))
+      if (target.RootParent is Mobile mobile && !mobile.CheckNonlocalDrop(from, this, target))
         return false;
       if (!from.OnDroppedItemToItem(this, target, p))
         return false;
@@ -4290,11 +4288,6 @@ namespace Server
       Delete();
     }
 
-    public virtual bool CheckBlessed(object obj)
-    {
-      return CheckBlessed(obj as Mobile);
-    }
-
     public virtual bool CheckBlessed(Mobile m)
     {
       if (m_LootType == LootType.Blessed || Mobile.InsuranceEnabled && Insured)

Server/Items/Container.cs

@@ -233,7 +233,7 @@ namespace Server.Items
         }
       }
 
-      object parent = Parent;
+      IEntity parent = Parent;
 
       while (parent != null)
       {
@@ -627,15 +627,9 @@ namespace Server.Items
 
     public virtual bool CheckContentDisplay(Mobile from)
     {
-      if (DisplaysContent)
+      return DisplaysContent && RootParent == null ||
-      {
+             RootParent is Item || RootParent == from ||
-        object root = RootParent;
+             from.AccessLevel > AccessLevel.Player;
-
-        if (root == null || root is Item || root == from || from.AccessLevel > AccessLevel.Player)
-          return true;
-      }
-
-      return false;
     }
 
     public override void OnSingleClick(Mobile from)

Server/Mobile.cs

@@ -4667,7 +4667,7 @@ namespace Server
       if (m_Spell != null && !m_Spell.OnCasterUsingObject(item))
         return;
 
-      object root = item.RootParent;
+      IEntity root = item.RootParent;
       bool okay = false;
 
       if (!Utility.InUpdateRange(this, item.GetWorldLocation()))
@@ -4789,7 +4789,7 @@ namespace Server
           }
           else
           {
-            object root = item.RootParent;
+            IEntity root = item.RootParent;
 
             if (root is Mobile mobile && !mobile.CheckNonlocalLift(from, item))
             {
@@ -4964,7 +4964,7 @@ namespace Server
       if (DragEffects && !item.Deleted)
       {
         Map map = m_Map;
-        object root = item.RootParent;
+        IEntity root = item.RootParent;
 
         if (map != null && (root == null || root is Item))
         {

Server/NativeReader.cs

@@ -56,7 +56,7 @@ namespace Server
       UnsafeNativeMethods.ReadFile(ptr, buffer, (uint)length, ref lpNumberOfBytesRead, null);
     }
 
-    internal class UnsafeNativeMethods
+    internal static class UnsafeNativeMethods
     {
       /*[DllImport("kernel32")]
       internal unsafe static extern int _lread(IntPtr hFile, void* lpBuffer, int wBytes);*/
@@ -74,10 +74,10 @@ namespace Server
       UnsafeNativeMethods.read(ptr, buffer, length);
     }
 
-    internal class UnsafeNativeMethods
+    internal static class UnsafeNativeMethods
     {
       [DllImport("libc")]
       internal static extern unsafe int read(IntPtr ptr, void* buffer, int length);
     }
   }
-}
+}

Server/Targeting/Target.cs

@@ -165,9 +165,7 @@ namespace Server.Targeting
           return;
         }
 
-        object root = item.RootParent;
+        if (!AllowNonlocal && item.RootParent is Mobile && item.RootParent != from && from.AccessLevel == AccessLevel.Player)
-
-        if (!AllowNonlocal && root is Mobile && root != from && from.AccessLevel == AccessLevel.Player)
         {
           OnNonlocalTarget(from, item);
           OnTargetFinish(from);
@@ -290,4 +288,4 @@ namespace Server.Targeting
       }
     }
   }
-}
+}