(965c31410a) Unstable v0.10.4.0

2020-07-21 08:57:50 -03:00
parent 4f8bd39789
commit 33d3a41104
546 changed files with 45952 additions and 25762 deletions
@@ -30,7 +30,8 @@ namespace Barotrauma.Networking

                if (orderIndex < 0 || orderIndex >= Order.PrefabList.Count)
                {
-                    DebugConsole.ThrowError("Invalid order message from client \"" + c.Name + "\" - order index out of bounds.");
+                    DebugConsole.ThrowError($"Invalid order message from client \"{c.Name}\" - order index out of bounds ({orderIndex}, {orderOptionIndex}).");
+                    if (NetIdUtils.IdMoreRecent(ID, c.LastSentChatMsgID)) { c.LastSentChatMsgID = ID; }
                    return;
                }

@@ -44,7 +45,7 @@ namespace Barotrauma.Networking
                txt = msg.ReadString() ?? "";
            }

-            if (!NetIdUtils.IdMoreRecent(ID, c.LastSentChatMsgID)) return;
+            if (!NetIdUtils.IdMoreRecent(ID, c.LastSentChatMsgID)) { return; }

            c.LastSentChatMsgID = ID;

@@ -168,6 +169,10 @@ namespace Barotrauma.Networking
            {
                msg.Write(Sender.ID);
            }
+            if (Type == ChatMessageType.ServerMessageBoxInGame)
+            {
+                msg.Write(IconStyle);
+            }
        }
    }
 }