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

Fixed clients not recreating docking port hulls/gaps when receiving a network event if the docking port is already locked

Browse Source
This commit is contained in:
Joonas Rikkonen
2018-07-23 23:27:27 +03:00
parent 2c6535b1f2
commit 3b6bedb180
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/Items/Components/DockingPort.cs
+15 -16
View File
@@ -243,30 +243,29 @@ namespace Barotrauma.Items.Components
DebugConsole.ThrowError("Error - attempted to lock a docking port that's not connected to anything"); DebugConsole.ThrowError("Error - attempted to lock a docking port that's not connected to anything");
return; return;
} }
else if (joint is WeldJoint)
{
//DebugConsole.ThrowError("Error - attempted to lock a docking port that's already locked");
return;
}
dockingDir = IsHorizontal ? if (!(joint is WeldJoint))
Math.Sign(dockingTarget.item.WorldPosition.X - item.WorldPosition.X) : {
Math.Sign(dockingTarget.item.WorldPosition.Y - item.WorldPosition.Y);
dockingTarget.dockingDir = -dockingDir; dockingDir = IsHorizontal ?
Math.Sign(dockingTarget.item.WorldPosition.X - item.WorldPosition.X) :
Math.Sign(dockingTarget.item.WorldPosition.Y - item.WorldPosition.Y);
dockingTarget.dockingDir = -dockingDir;
#if CLIENT #if CLIENT
PlaySound(ActionType.OnSecondaryUse, item.WorldPosition); PlaySound(ActionType.OnSecondaryUse, item.WorldPosition);
#endif #endif
ConnectWireBetweenPorts(); ConnectWireBetweenPorts();
CreateJoint(true);
CreateJoint(true); if (GameMain.Server != null)
{
if (GameMain.Server != null) item.CreateServerEvent(this);
{ }
item.CreateServerEvent(this);
} }
List<MapEntity> removedEntities = item.linkedTo.Where(e => e.Removed).ToList(); List<MapEntity> removedEntities = item.linkedTo.Where(e => e.Removed).ToList();
foreach (MapEntity removed in removedEntities) item.linkedTo.Remove(removed); foreach (MapEntity removed in removedEntities) item.linkedTo.Remove(removed);