Unstable 0.1400.0.0

This commit is contained in:
Markus Isberg
2021-05-11 15:47:47 +03:00
parent 3f324b14e8
commit 92f0264af2
247 changed files with 8238 additions and 1911 deletions
@@ -280,7 +280,7 @@ namespace Barotrauma
public void ResolveLinks(IdRemap childRemap)
{
if (unresolvedLinkedToID == null) { return; }
for (int i=0;i<unresolvedLinkedToID.Count;i++)
for (int i = 0; i < unresolvedLinkedToID.Count; i++)
{
int srcId = unresolvedLinkedToID[i];
int targetId = childRemap.GetOffsetId(srcId);
@@ -649,7 +649,10 @@ namespace Barotrauma
else
{
object newEntity = loadMethod.Invoke(t, new object[] { element, submarine, idRemap });
if (newEntity != null) entities.Add((MapEntity)newEntity);
if (newEntity != null)
{
entities.Add((MapEntity)newEntity);
}
}
}
catch (TargetInvocationException e)