Unstable v0.1100.0.4 (November 11th 2020)

2020-11-06 20:12:15 +02:00
parent 6b36bf809d
commit b772654326
297 changed files with 12502 additions and 4277 deletions
@@ -13,7 +13,8 @@ namespace Barotrauma.Networking
            msg.Write(TargetCharacter == null ? (UInt16)0 : TargetCharacter.ID);
            msg.Write(TargetEntity is Entity ? (TargetEntity as Entity).ID : (UInt16)0);
            msg.Write((byte)Array.IndexOf(Order.Prefab.Options, OrderOption));
-            if (TargetEntity is OrderTarget orderTarget)
+            msg.Write((byte)Order.TargetType);
+            if (Order.TargetType == Order.OrderTargetType.Position && TargetEntity is OrderTarget orderTarget)
            {
                msg.Write(true);
                msg.Write(orderTarget.Position.X);
@@ -23,6 +24,10 @@ namespace Barotrauma.Networking
            else
            {
                msg.Write(false);
+                if (Order.TargetType == Order.OrderTargetType.WallSection)
+                {
+                    msg.Write((byte)(WallSectionIndex ?? Order.WallSectionIndex ?? 0));
+                }
            }
        }
    }