Merge https://github.com/Regalis11/Barotrauma into develop
This commit is contained in:
@@ -18,11 +18,11 @@ namespace Barotrauma.Items.Components
|
||||
|
||||
if (item.CanClientAccess(c))
|
||||
{
|
||||
lastReceivedTargetForce = null;
|
||||
if (Math.Abs(newTargetForce - targetForce) > 0.01f)
|
||||
{
|
||||
GameServer.Log(GameServer.CharacterLogName(c.Character) + " set the force of " + item.Name + " to " + (int)(newTargetForce) + " %", ServerLog.MessageType.ItemInteraction);
|
||||
}
|
||||
|
||||
targetForce = newTargetForce;
|
||||
User = c.Character;
|
||||
}
|
||||
|
||||
@@ -185,7 +185,7 @@ namespace Barotrauma.Items.Components
|
||||
//already connected, no need to do anything
|
||||
if (Connections[i].Wires.Contains(newWire)) { continue; }
|
||||
|
||||
newWire.Connect(Connections[i], true, true);
|
||||
newWire.TryConnect(Connections[i], true, true);
|
||||
Connections[i].TryAddLink(newWire);
|
||||
|
||||
var otherConnection = newWire.OtherConnection(Connections[i]);
|
||||
|
||||
Reference in New Issue
Block a user