Unstable v0.19.3.0

This commit is contained in:
Juan Pablo Arce
2022-09-02 15:10:56 -03:00
parent 28789616bd
commit 3f2c843247
336 changed files with 7152 additions and 7739 deletions
@@ -208,7 +208,7 @@ namespace Barotrauma.Items.Components
public void ServerEventWrite(IWriteMessage msg, Client c, NetEntityEvent.IData extraData = null)
{
msg.Write(user == null ? (ushort)0 : user.ID);
msg.WriteUInt16(user == null ? (ushort)0 : user.ID);
ClientEventWrite(msg, extraData);
}
}
@@ -72,15 +72,15 @@ namespace Barotrauma.Items.Components
var element = customInterfaceElementList[i];
if (element.HasPropertyName)
{
msg.Write(element.Signal);
msg.WriteString(element.Signal);
}
else if(element.ContinuousSignal)
{
msg.Write(element.State);
msg.WriteBoolean(element.State);
}
else
{
msg.Write(extraData is Item.ComponentStateEventData { ComponentData: EventData eventData } && eventData.BtnElement == customInterfaceElementList[i]);
msg.WriteBoolean(extraData is Item.ComponentStateEventData { ComponentData: EventData eventData } && eventData.BtnElement == customInterfaceElementList[i]);
}
}
}
@@ -38,7 +38,7 @@ namespace Barotrauma.Items.Components
public void ServerEventWrite(IWriteMessage msg, Client c, NetEntityEvent.IData extraData = null)
{
msg.Write(Value);
msg.WriteString(Value);
lastSentValue = Value;
}
}
@@ -101,11 +101,11 @@ namespace Barotrauma.Items.Components
{
if (TryExtractEventData(extraData, out ServerEventData eventData))
{
msg.Write(eventData.MsgToSend);
msg.WriteString(eventData.MsgToSend);
}
else
{
msg.Write(OutputValue);
msg.WriteString(OutputValue);
}
}
}
@@ -41,8 +41,8 @@ namespace Barotrauma.Items.Components
msg.WriteRangedInteger(nodeCount, 0, MaxNodesPerNetworkEvent);
for (int i = nodeStartIndex; i < nodeStartIndex + nodeCount; i++)
{
msg.Write(nodes[i].X);
msg.Write(nodes[i].Y);
msg.WriteSingle(nodes[i].X);
msg.WriteSingle(nodes[i].Y);
}
}