Unstable 0.17.4.0

2022-03-30 00:08:09 +09:00
parent 2968e23ae8
commit c1b8e5a341
177 changed files with 3388 additions and 1977 deletions
@@ -424,7 +424,7 @@ namespace Barotrauma
                    msg.Write(owner == c && owner.Character == this);
                    msg.Write(owner != null && owner.Character == this && GameMain.Server.ConnectedClients.Contains(owner) ? owner.ID : (byte)0);
                    break;
-                case StatusEventData _:
+                case CharacterStatusEventData _:
                    WriteStatus(msg);
                    break;
                case UpdateSkillsEventData _:
@@ -657,6 +657,10 @@ namespace Barotrauma
            int infoLength = msg.LengthBytes - msgLengthBeforeInfo;

            msg.Write((byte)CampaignInteractionType);
+            if (CampaignInteractionType == CampaignMode.InteractionType.Store)
+            {
+                msg.Write(MerchantIdentifier);
+            }

            int msgLengthBeforeOrders = msg.LengthBytes;
            // Current orders