Unstable 0.1500.0.0

This commit is contained in:
Markus Isberg
2021-08-26 21:08:21 +09:00
parent 265a2e7ab3
commit 501e02c026
245 changed files with 9775 additions and 2034 deletions
@@ -48,8 +48,7 @@ namespace Barotrauma
}
}
//observable collection because some entities may need to be notified when the collection is modified
public readonly ObservableCollection<MapEntity> linkedTo = new ObservableCollection<MapEntity>();
public readonly List<MapEntity> linkedTo = new List<MapEntity>();
protected bool flippedX, flippedY;
public bool FlippedX { get { return flippedX; } }
@@ -515,7 +514,11 @@ namespace Barotrauma
}
#endif
if (aiTarget != null) aiTarget.Remove();
if (aiTarget != null)
{
aiTarget.Remove();
aiTarget = null;
}
if (linkedTo != null)
{