vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Build 0.18.0.0

Browse Source
This commit is contained in:
Markus Isberg
2022-05-13 00:55:52 +09:00
parent 15d18e6ff6
commit 7547a9b78a
218 changed files with 3881 additions and 2192 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/Networking/RespawnManager.cs
+12 -5
View File
@@ -21,6 +21,8 @@ namespace Barotrauma.Networking
private readonly NetworkMember networkMember;
private readonly Steering shuttleSteering;
private readonly List<Door> shuttleDoors;
private const string RespawnContainerTag = "respawncontainer";
private readonly ItemContainer respawnContainer;
//items created during respawn
//any respawn items left in the shuttle are removed when the shuttle despawns
@@ -100,13 +102,18 @@ namespace Barotrauma.Networking
shuttleDoors = new List<Door>();
foreach (Item item in Item.ItemList)
{
if (item.Submarine != RespawnShuttle) continue;
if (item.Submarine != RespawnShuttle) { continue; }
if (item.HasTag(RespawnContainerTag))
{
respawnContainer = item.GetComponent<ItemContainer>();
}
var steering = item.GetComponent<Steering>();
if (steering != null) shuttleSteering = steering;
if (steering != null) { shuttleSteering = steering; }
var door = item.GetComponent<Door>();
if (door != null) shuttleDoors.Add(door);
if (door != null) { shuttleDoors.Add(door); }
//lock all wires to prevent the players from messing up the electronics
var connectionPanel = item.GetComponent<ConnectionPanel>();
@@ -227,14 +234,14 @@ namespace Barotrauma.Networking
despawnTime = ReturnTime + new TimeSpan(0, 0, seconds: 30);
#endif
if (RespawnShuttle == null) return;
if (RespawnShuttle == null) { return; }
foreach (Item item in Item.ItemList)
{
if (item.Submarine != RespawnShuttle) { continue; }
//remove respawn items that have been left in the shuttle
if (respawnItems.Contains(item))
if (respawnItems.Contains(item) || respawnContainer?.Item != null && item.IsOwnedBy(respawnContainer.Item))
{
Spawner.AddItemToRemoveQueue(item);
continue;