Merge branch 'master' of https://github.com/Regalis11/Barotrauma
This commit is contained in:
@@ -1322,17 +1322,20 @@ namespace Barotrauma
|
||||
}
|
||||
}
|
||||
|
||||
for (int i = 0; i < components.Count && i < clone.components.Count; i++)
|
||||
if (clonedContainedItems.Any())
|
||||
{
|
||||
ItemComponent component = components[i],
|
||||
cloneComp = clone.components[i];
|
||||
|
||||
if (component is not CircuitBox origBox || cloneComp is not CircuitBox cloneBox)
|
||||
for (int i = 0; i < components.Count && i < clone.components.Count; i++)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
ItemComponent component = components[i],
|
||||
cloneComp = clone.components[i];
|
||||
|
||||
cloneBox.CloneFrom(origBox, clonedContainedItems);
|
||||
if (component is not CircuitBox origBox || cloneComp is not CircuitBox cloneBox)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
cloneBox.CloneFrom(origBox, clonedContainedItems);
|
||||
}
|
||||
}
|
||||
|
||||
clone.FullyInitialized = true;
|
||||
@@ -3242,7 +3245,7 @@ namespace Barotrauma
|
||||
SetDroppedStackItemStates();
|
||||
droppedStack = null;
|
||||
#if SERVER
|
||||
if (GameMain.NetworkMember is { IsServer: true } server)
|
||||
if (GameMain.NetworkMember is { IsServer: true } server && !Removed)
|
||||
{
|
||||
server.CreateEntityEvent(this, new DroppedStackEventData(Enumerable.Empty<Item>()));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user