fix: Fixes boat turning abandoning entities (#1878)

modernuo · Jul 21, 2024 · 428ae46 · 428ae46
1 parent b4611ab
commit 428ae46
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/Projects/Server/IEntity.cs b/Projects/Server/IEntity.cs
@@ -19,7 +19,7 @@ namespace Server;
 
 public interface IEntity : IPoint3D, ISerializable
 {
-    Point3D Location { get; }
+    Point3D Location { get; set; }
     Map Map { get; }
     void MoveToWorld(Point3D location, Map map);
 
@@ -53,7 +53,7 @@ public Entity(Serial serial, Point3D loc, Map map) : this(serial)
 
     public Serial Serial { get; }
 
-    public Point3D Location { get; private set; }
+    public Point3D Location { get; set; }
 
     public int X => Location.X;
 

diff --git a/Projects/UOContent/Multis/Boats/BaseBoat.cs b/Projects/UOContent/Multis/Boats/BaseBoat.cs
@@ -2088,26 +2088,30 @@ public bool SetFacing(Direction facing)
 
             var xOffset = 0;
             var yOffset = 0;
-            Movement.Movement.Offset(facing, ref xOffset, ref yOffset);
+            CalcMoves.Offset(facing, ref xOffset, ref yOffset);
 
             var count = ((_facing - old) & 0x7) / 2;
 
+            using var queue = PooledRefQueue<IEntity>.Create();
             foreach (var e in GetMovingEntities())
             {
                 if (e == this)
                 {
                     continue;
                 }
 
-                if (e is Item item)
-                {
-                    item.Location = Rotate(item.Location, count);
-                }
-                else if (e is Mobile m)
+                if (e is Mobile m)
                 {
                     m.Direction = (m.Direction - old + facing) & Direction.Mask;
-                    m.Location = Rotate(m.Location, count);
                 }
+
+                queue.Enqueue(e);
+            }
+
+            while (queue.Count > 0)
+            {
+                var e = queue.Dequeue();
+                e.Location = Rotate(e.Location, count);
             }
 
             if (TillerMan != null)