fix: Fixes Point2D ctor (#1340)

Projects/Server/Geometry/Point2D.cs

@@ -41,16 +41,27 @@ public struct Point2D
         set => m_Y = value;
     }
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public Point2D(IPoint2D p) : this(p.X, p.Y)
+    {
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public Point2D(Point3D p) : this(p.X, p.Y)
+    {
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public Point2D(Point2D p) : this(p.X, p.Y)
+    {
+    }
+
     public Point2D(int x, int y)
     {
         m_X = x;
         m_Y = y;
     }
 
-    public Point2D(Point2D p) : this(p.X, p.Y)
-    {
-    }
-
     public bool Equals(Point2D other) => m_X == other.m_X && m_Y == other.m_Y;
 
     public bool Equals(IPoint2D other) => m_X == other?.X && m_Y == other.Y;

Projects/Server/Geometry/Point3D.cs

@@ -54,10 +54,12 @@ public struct Point3D
     {
     }
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public Point3D(Point3D p) : this(p.X, p.Y, p.Z)
     {
     }
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public Point3D(Point2D p, int z) : this(p.X, p.Y, z)
     {
     }

Projects/Server/Regions/Region.cs

@@ -336,8 +336,8 @@ public class Region : IComparable<Region>
         {
             var rect = Area[i];
 
-            var start = Map.Bound(new Point2D(rect.Start.X, rect.Start.Y));
+            var start = Map.Bound(new Point2D(rect.Start));
-            var end = Map.Bound(new Point2D(rect.End.X, rect.End.Y));
+            var end = Map.Bound(new Point2D(rect.End));
 
             var startSector = Map.GetSector(start);
             var endSector = Map.GetSector(end);

Projects/UOContent/Gumps/Props/SetPoint2DGump.cs

@@ -115,7 +115,7 @@ namespace Server.Gumps
             {
                 case 1: // Current location
                     {
-                        toSet = new Point2D(m_Mobile.Location.X, m_Mobile.Location.Y);
+                        toSet = new Point2D(m_Mobile.Location);
                         shouldSet = true;
                         shouldSend = true;
 
@@ -198,7 +198,7 @@ namespace Server.Gumps
                 {
                     try
                     {
-                        var p = new Point2D(point3D.X, point3D.Y);
+                        var p = new Point2D(point3D);
                         CommandLogging.LogChangeProperty(m_Mobile, m_Object, m_Property.Name, p.ToString());
                         m_Property.SetValue(m_Object, p, null);
                         m_PropertiesGump.OnValueChanged(m_Object, m_Property);

Projects/UOContent/Items/Weapons/Staves/ShepherdsCrook.cs

@@ -125,35 +125,32 @@ namespace Server.Items
 
                 protected override void OnTarget(Mobile from, object targ)
                 {
-                    if (targ is IPoint2D p)
+                    if (targ is not IPoint2D p)
                     {
-                        var min = m_Creature.MinTameSkill - 30;
+                        return;
-                        var max = m_Creature.MinTameSkill + 30 + Utility.Random(10);
+                    }
 
-                        if (max <= from.Skills.Herding.Value)
+                    var min = m_Creature.MinTameSkill - 30;
-                        {
+                    var max = m_Creature.MinTameSkill + 30 + Utility.Random(10);
-                            m_Creature.PrivateOverheadMessage(
-                                MessageType.Regular,
-                                0x3B2,
-                                502471, // That wasn't even challenging.
-                                from.NetState
-                            );
-                        }
 
-                        if (from.CheckTargetSkill(SkillName.Herding, m_Creature, min, max))
+                    if (max <= from.Skills.Herding.Value)
-                        {
+                    {
-                            if (p != from)
+                        m_Creature.PrivateOverheadMessage(
-                            {
+                            MessageType.Regular,
-                                p = new Point2D(p.X, p.Y);
+                            0x3B2,
-                            }
+                            502471, // That wasn't even challenging.
+                            from.NetState
+                        );
+                    }
 
-                            m_Creature.TargetLocation = p;
+                    if (from.CheckTargetSkill(SkillName.Herding, m_Creature, min, max))
-                            from.SendLocalizedMessage(502479); // The animal walks where it was instructed to.
+                    {
-                        }
+                        m_Creature.TargetLocation = targ != from ? new Point2D(p) : p;
-                        else
+                        from.SendLocalizedMessage(502479); // The animal walks where it was instructed to.
-                        {
+                    }
-                            from.SendLocalizedMessage(502472); // You don't seem to be able to persuade that to move.
+                    else
-                        }
+                    {
+                        from.SendLocalizedMessage(502472); // You don't seem to be able to persuade that to move.
                     }
                 }
             }

Projects/UOContent/Mobiles/AI/BaseAI.cs

@@ -1352,7 +1352,7 @@ public abstract class BaseAI
 
         var distance = m_Mobile.GetDistanceToSqrt(target);
 
-        if (!(distance is < 1 or > 15))
+        if (distance is not (< 1 or > 15))
         {
             DoMove(m_Mobile.GetDirectionTo(target));
             return true;

Projects/UOContent/Skills/Tracking/Tracking.cs

@@ -79,7 +79,7 @@ namespace Server.SkillHandlers
             {
                 m_Tracker = tracker;
                 m_Target = target;
-                m_Location = new Point2D(target.X, target.Y);
+                m_Location = new Point2D(target);
                 m_Map = target.Map;
             }
         }