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

Fixed wires dropping when a client moves them from a connection to another in the same connection panel, fixed wires becoming disconnected client-side if they're moved from a connection to another connection that's upper in the connection panel. (See #252)

Browse Source
This commit is contained in:
Joonas Rikkonen
2018-02-15 14:23:39 +02:00
parent a2c898150e
commit 7d346c1437
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/Items/Components/Signal/ConnectionPanel.cs
+6 -2
View File
@@ -235,7 +235,7 @@ namespace Barotrauma.Items.Components
//wires that are not in anyone's inventory (i.e. not currently being rewired) //wires that are not in anyone's inventory (i.e. not currently being rewired)
//can never be connected to only one connection //can never be connected to only one connection
// -> the client must have dropped the wire from the connection panel // -> the client must have dropped the wire from the connection panel
if (existingWire.Item.ParentInventory == null) if (existingWire.Item.ParentInventory == null && !wires.Any(w => w.Contains(existingWire)))
{ {
//let other clients know the item was also disconnected from the other connection //let other clients know the item was also disconnected from the other connection
existingWire.Connections[0].Item.CreateServerEvent(existingWire.Connections[0].Item.GetComponent<ConnectionPanel>()); existingWire.Connections[0].Item.CreateServerEvent(existingWire.Connections[0].Item.GetComponent<ConnectionPanel>());
@@ -247,7 +247,7 @@ namespace Barotrauma.Items.Components
GameServer.Log(c.Character.LogName + " disconnected a wire from " + GameServer.Log(c.Character.LogName + " disconnected a wire from " +
Connections[i].Item.Name + " (" + Connections[i].Name + ") to " + existingWire.Connections[1].Item.Name + " (" + existingWire.Connections[1].Name + ")", ServerLog.MessageType.ItemInteraction); Connections[i].Item.Name + " (" + Connections[i].Name + ") to " + existingWire.Connections[1].Item.Name + " (" + existingWire.Connections[1].Name + ")", ServerLog.MessageType.ItemInteraction);
if (existingWire.Item.ParentInventory == null) if (existingWire.Item.ParentInventory == null && !wires.Any(w => w.Contains(existingWire)))
{ {
//let other clients know the item was also disconnected from the other connection //let other clients know the item was also disconnected from the other connection
existingWire.Connections[1].Item.CreateServerEvent(existingWire.Connections[1].Item.GetComponent<ConnectionPanel>()); existingWire.Connections[1].Item.CreateServerEvent(existingWire.Connections[1].Item.GetComponent<ConnectionPanel>());
@@ -304,6 +304,10 @@ namespace Barotrauma.Items.Components
foreach (Connection connection in Connections) foreach (Connection connection in Connections)
{ {
connection.ClearConnections(); connection.ClearConnections();
}
foreach (Connection connection in Connections)
{
int wireCount = msg.ReadRangedInteger(0, Connection.MaxLinked); int wireCount = msg.ReadRangedInteger(0, Connection.MaxLinked);
for (int i = 0; i < wireCount; i++) for (int i = 0; i < wireCount; i++)
{ {