(5a377a8ee) Unstable v0.9.1000.0

This commit is contained in:
Juan Pablo Arce
2020-05-13 12:55:42 -03:00
parent b143329701
commit a1ca41aa5d
426 changed files with 14384 additions and 5708 deletions
@@ -9,7 +9,7 @@ namespace Barotrauma
msg.Write((ushort)items.Count);
foreach (Item item in items)
{
item.WriteSpawnData(msg, item.ID);
item.WriteSpawnData(msg, item.ID, item.ParentInventory?.Owner?.ID ?? 0);
}
}
}
@@ -1,9 +1,14 @@
using Barotrauma.Networking;
using System.Collections.Generic;
namespace Barotrauma
{
partial class SalvageMission : Mission
partial class SalvageMission : Mission
{
private bool usedExistingItem;
private readonly List<Pair<int, int>> executedEffectIndices = new List<Pair<int, int>>();
public override void ServerWriteInitial(IWriteMessage msg, Client c)
{
msg.Write(usedExistingItem);
@@ -13,7 +18,14 @@ namespace Barotrauma
}
else
{
item.WriteSpawnData(msg, item.ID);
item.WriteSpawnData(msg, item.ID, item.ParentInventory?.Owner?.ID ?? 0);
}
msg.Write((byte)executedEffectIndices.Count);
foreach (Pair<int, int> effectIndex in executedEffectIndices)
{
msg.Write((byte)effectIndex.First);
msg.Write((byte)effectIndex.Second);
}
}
}