From 1b66e51970d94f0a48b9b1a338de60bdc407acdb Mon Sep 17 00:00:00 2001 From: Regalis Date: Sat, 8 Oct 2016 18:02:10 +0300 Subject: [PATCH] Additional cargo isn't spawned in shuttles, fixed exception if trying to spawn additional cargo in a sub with no cargo spawnpoint, netlobby chatMsgBox stays selected after sending a chat message --- Subsurface/Source/Networking/GameServer.cs | 13 +++++++++++-- Subsurface/Source/Networking/NetworkMember.cs | 4 ++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Subsurface/Source/Networking/GameServer.cs b/Subsurface/Source/Networking/GameServer.cs index f39efd0d0..c612629b0 100644 --- a/Subsurface/Source/Networking/GameServer.cs +++ b/Subsurface/Source/Networking/GameServer.cs @@ -963,9 +963,18 @@ namespace Barotrauma.Networking } } - foreach (Submarine sub in Submarine.Loaded) + foreach (Submarine sub in Submarine.MainSubs) { + if (sub == null) continue; + WayPoint cargoSpawnPos = WayPoint.GetRandom(SpawnType.Cargo, null, sub); + + if (cargoSpawnPos == null) + { + DebugConsole.ThrowError("Couldn't spawn additional cargo (cargo spawnpoint now found)"); + continue; + } + var cargoRoom = cargoSpawnPos.CurrentHull; Vector2 position = new Vector2( cargoSpawnPos.Position.X + Rand.Range(-20.0f, 20.0f, false), @@ -980,7 +989,7 @@ namespace Barotrauma.Networking { Item.Spawner.QueueItem(itemPrefab, position, sub, false); } - } + } } diff --git a/Subsurface/Source/Networking/NetworkMember.cs b/Subsurface/Source/Networking/NetworkMember.cs index c75ee1094..bb9f1fd10 100644 --- a/Subsurface/Source/Networking/NetworkMember.cs +++ b/Subsurface/Source/Networking/NetworkMember.cs @@ -251,8 +251,8 @@ namespace Barotrauma.Networking if (string.IsNullOrWhiteSpace(message)) return false; SendChatMessage(message); - - textBox.Deselect(); + + if (textBox == chatMsgBox) textBox.Deselect(); return true; }