Unstable 0.15.13.0

2021-10-29 21:57:18 +09:00
parent 1718dbc1c1
commit a43b540d4b
67 changed files with 467 additions and 222 deletions
@@ -64,7 +64,18 @@ namespace Barotrauma.Networking
                    string orderOption = orderMessageInfo.OrderOption;
                    orderOption ??= orderMessageInfo.OrderOptionIndex.HasValue && orderMessageInfo.OrderOptionIndex >= 0 && orderMessageInfo.OrderOptionIndex < orderPrefab.Options.Length ?
                        orderPrefab.Options[orderMessageInfo.OrderOptionIndex.Value] : "";
-                    txt = orderPrefab.GetChatMessage(orderMessageInfo.TargetCharacter?.Name, senderCharacter?.CurrentHull?.DisplayName,
+                    string targetRoom;
+
+                    if (orderMessageInfo.TargetEntity is Hull targetHull)
+                    {
+                        targetRoom = targetHull.DisplayName;
+                    }
+                    else
+                    {
+                        targetRoom = senderCharacter?.CurrentHull?.DisplayName;
+                    }
+
+                    txt = orderPrefab.GetChatMessage(orderMessageInfo.TargetCharacter?.Name, targetRoom,
                        givingOrderToSelf: orderMessageInfo.TargetCharacter == senderCharacter,
                        orderOption: orderOption,
                        priority: orderMessageInfo.Priority);