- Fixed network synchro of vars, needs synctype testing.

Barotrauma/BarotraumaClient/ClientSource/LuaCs/_Services/NetworkingService.cs

@@ -13,9 +13,25 @@ partial class NetworkingService : INetworkingService, IEventServerConnected, IEv
 
     public void OnServerConnected()
     {
+        ActivateNetVars();
         SendSyncMessage();
     }
 
+    private void ActivateNetVars()
+    {
+        if (GameMain.Client == null)
+        {
+            return;
+        }
+        
+        // re-activate net vars
+        // todo: unregister net vars on client disconnect, currently handled by unloading the state machine.
+        foreach (var networkSyncVar in netVars.Keys)
+        {
+            networkSyncVar.SetNetworkOwner(this);
+        }
+    }
+
     public void OnReceivedServerNetMessage(IReadMessage netMessage, ServerPacketHeader serverPacketHeader)
     {
         if (serverPacketHeader != ServerHeader)
@@ -44,7 +60,7 @@ partial class NetworkingService : INetworkingService, IEventServerConnected, IEv
     private void SendSyncMessage()
     {
         if (GameMain.Client == null) { return; }
-
+        
         WriteOnlyMessage message = new WriteOnlyMessage();
         message.WriteByte((byte)ClientHeader);
         message.WriteByte((byte)ClientToServer.RequestSync);

Barotrauma/BarotraumaShared/LocalMods/[DebugOnlyTest]TestLuaMod/Settings.xml

@@ -2,6 +2,8 @@
 <Configuration>
   <Settings>
     <Setting Name="TestTickbox" Type="bool"/>
+	<Setting Name="TestSynchroClient" Type="int" NetSync="TwoWay" />
+	<Setting Name="TestSynchroServer" Type="int" NetSync="ServerAuthority" />
     <Setting Name="TestFloat" Type="float" NetSync="ServerAuthority" />
     <Setting Name="TestHidden" Type="bool" ShowInMenus="false"/>
     <Setting Name="TestRangeFloat" Type="rangeFloat" Min="0" Max="25" Steps="11"/>

Barotrauma/BarotraumaShared/SharedSource/LuaCs/Data/SettingEntry.cs

@@ -53,9 +53,14 @@ public partial class SettingEntry<T> : SettingBase, ISettingBase<T>, INetworkSyn
 
     public virtual bool TrySetValue(T value)
     {
+        if (value is null || value.Equals(Value))
+        {
+            return false;
+        }
 #if CLIENT
         if (SyncType is NetSync.ServerAuthority && NetworkingService is not null 
                                                 && GameMain.IsMultiplayer
+                                                && GameMain.Client is not null
                                                 && !GameMain.Client.HasPermission(this.WritePermissions))
         {
             return false;
@@ -73,7 +78,7 @@ public partial class SettingEntry<T> : SettingBase, ISettingBase<T>, INetworkSyn
             NetworkingService?.SendNetVar(this);
         }
 #elif SERVER
-        if (GameMain.IsMultiplayer && SyncType is NetSync.TwoWay or NetSync.ServerAuthority)
+        if (SyncType is NetSync.TwoWay or NetSync.ServerAuthority)
         {
             NetworkingService?.SendNetVar(this);
         }
@@ -97,9 +102,48 @@ public partial class SettingEntry<T> : SettingBase, ISettingBase<T>, INetworkSyn
         return true;
     }
 
+    /// <summary>
+    /// handles internal networking rules after reading the net message (to avoid synchro issues).
+    /// </summary>
+    /// <param name="value"></param>
+    /// <returns></returns>
+    private bool TrySetValueNetwork(T value)
+    {
+        if (NetworkingService is null)
+        {
+            return false;
+        }
+#if CLIENT
+        if (SyncType is NetSync.None or NetSync.ClientOneWay)
+        {
+            return false;
+        }
+#else
+        if (SyncType is NetSync.None or NetSync.ServerAuthority)
+        {
+            return false;
+        }
+#endif
+        if (!TrySetValueInternal(value))
+        {
+            return false;
+        }
+
+#if SERVER
+        if (SyncType is NetSync.TwoWay)
+        {
+            NetworkingService?.SendNetVar(this);
+        }
+#endif
+        
+        OnValueChanged?.Invoke(this);
+        return true;
+    }
+
     protected override void OnDispose()
     {
         ValueChangePredicate = null;
+        NetworkingService?.DeregisterNetVar(this);
     }
 
     public override Type GetValueType() => typeof(T);
@@ -151,11 +195,6 @@ public partial class SettingEntry<T> : SettingBase, ISettingBase<T>, INetworkSyn
     public void SetNetworkOwner(IEntityNetworkingService networkingService)
     {
         NetworkingService = networkingService;
-        if (NetworkingService is null)
-        {
-            return;
-        }
-        NetworkingService.RegisterNetVar(this);
     }
 
     public NetSync SyncType => ConfigInfo?.NetSync ?? NetSync.None;
@@ -181,42 +220,42 @@ public partial class SettingEntry<T> : SettingBase, ISettingBase<T>, INetworkSyn
             switch (typeCode)
             {
                  case TypeCode.Boolean:
-                     TrySetValueInternal((T)Convert.ChangeType(message.ReadBoolean(), typeCode));
+                     TrySetValueNetwork((T)Convert.ChangeType(message.ReadBoolean(), typeCode));
                      return;
                  case TypeCode.Byte:
-                     TrySetValueInternal((T)Convert.ChangeType(message.ReadByte(), typeCode));
+                     TrySetValueNetwork((T)Convert.ChangeType(message.ReadByte(), typeCode));
                      return;
                  // SByte not supported by interface
                  case TypeCode.SByte:
-                     TrySetValueInternal((T)Convert.ChangeType(message.ReadInt16(), typeCode));
+                     TrySetValueNetwork((T)Convert.ChangeType(message.ReadInt16(), typeCode));
                      return;
                  case TypeCode.Int16:
-                     TrySetValueInternal((T)Convert.ChangeType(message.ReadInt16(), typeCode));
+                     TrySetValueNetwork((T)Convert.ChangeType(message.ReadInt16(), typeCode));
                      return;
                  case TypeCode.Char:
                  case TypeCode.UInt16:
-                     TrySetValueInternal((T)Convert.ChangeType(message.ReadUInt16(), typeCode));
+                     TrySetValueNetwork((T)Convert.ChangeType(message.ReadUInt16(), typeCode));
                      return;
                  case TypeCode.Int32:
-                     TrySetValueInternal((T)Convert.ChangeType(message.ReadInt32(), typeCode));
+                     TrySetValueNetwork((T)Convert.ChangeType(message.ReadInt32(), typeCode));
                      return;
                  case TypeCode.UInt32:
-                     TrySetValueInternal((T)Convert.ChangeType(message.ReadUInt32(), typeCode));
+                     TrySetValueNetwork((T)Convert.ChangeType(message.ReadUInt32(), typeCode));
                      return;
                  case TypeCode.Int64:
-                     TrySetValueInternal((T)Convert.ChangeType(message.ReadInt64(), typeCode));
+                     TrySetValueNetwork((T)Convert.ChangeType(message.ReadInt64(), typeCode));
                      return;
                  case TypeCode.UInt64:
-                     TrySetValueInternal((T)Convert.ChangeType(message.ReadUInt64(), typeCode));
+                     TrySetValueNetwork((T)Convert.ChangeType(message.ReadUInt64(), typeCode));
                      return;
                  case TypeCode.Single:
-                     TrySetValueInternal((T)Convert.ChangeType(message.ReadSingle(), typeCode));
+                     TrySetValueNetwork((T)Convert.ChangeType(message.ReadSingle(), typeCode));
                      return;
                  case TypeCode.Double:
-                     TrySetValueInternal((T)Convert.ChangeType(message.ReadDouble(), typeCode));
+                     TrySetValueNetwork((T)Convert.ChangeType(message.ReadDouble(), typeCode));
                      return;
                  case TypeCode.String:
-                     TrySetValueInternal((T)Convert.ChangeType(message.ReadString(), typeCode));
+                     TrySetValueNetwork((T)Convert.ChangeType(message.ReadString(), typeCode));
                      return;
                  case TypeCode.Decimal: 
                  default:

Barotrauma/BarotraumaShared/SharedSource/LuaCs/Data/SettingList.cs

@@ -91,7 +91,11 @@ public class SettingList<T> : SettingEntry<T>, ISettingList<T> where T : IEquata
 
     public bool TrySetValueByIndex(int index)
     {
-        throw new NotImplementedException();
+        if (_valuesList.Count <= index)
+        {
+            return false;
+        }
+        return base.TrySetValue(_valuesList[index]);
     }
 
     public IReadOnlyList<T> Options => _valuesList.AsReadOnly();

Barotrauma/BarotraumaShared/SharedSource/LuaCs/IEvents.cs

@@ -947,6 +947,8 @@ interface IEventInventoryItemSwap : IEvent<IEventInventoryItemSwap>
 
 #region Networking
 
+
+
 #region Networking-Server
 #if SERVER
 public interface IEventClientRawNetMessageReceived : IEvent<IEventClientRawNetMessageReceived>

Barotrauma/BarotraumaShared/SharedSource/LuaCs/_Services/NetworkingService.cs

@@ -11,10 +11,11 @@ using System.Linq;
 using System.Net.Http;
 using System.Security.Cryptography;
 using System.Text;
+using Barotrauma.LuaCs.Data;
 
 namespace Barotrauma.LuaCs;
 
-internal partial class NetworkingService : INetworkingService
+internal partial class NetworkingService : INetworkingService, IEventSettingInstanceLifetime
 {
     public readonly record struct NetId
     {
@@ -112,7 +113,6 @@ internal partial class NetworkingService : INetworkingService
 #if SERVER
         IsSynchronized = true;
 #endif
-
         SubscribeToEvents();
     }
 
@@ -189,6 +189,7 @@ internal partial class NetworkingService : INetworkingService
 
     private void SubscribeToEvents()
     {
+        _eventService.Subscribe<IEventSettingInstanceLifetime>(this);
 #if CLIENT
         _eventService.Subscribe<IEventServerConnected>(this);
         _eventService.Subscribe<IEventServerRawNetMessageReceived>(this);
@@ -246,7 +247,18 @@ internal partial class NetworkingService : INetworkingService
 #endif
     }
 
-    public void SendNetVar(INetworkSyncVar netVar) => SendNetVar(netVar);
+    public void DeregisterNetVar(INetworkSyncVar netVar)
+    {
+        if (netVar is null)
+        {
+            return;
+        }
+
+        netVar.SetNetworkOwner(null);
+        netVars.TryRemove(netVar, out _);
+    }
+
+    public void SendNetVar(INetworkSyncVar netVar) => SendNetVar(netVar, null);
 
     public void SendNetVar(INetworkSyncVar netVar, NetworkConnection connection = null)
     {
@@ -390,4 +402,20 @@ internal partial class NetworkingService : INetworkingService
 #endif
 
     #endregion
+
+    public void OnSettingInstanceCreated<T>(T configInstance) where T : ISettingBase
+    {
+        if (configInstance is INetworkSyncVar syncVar)
+        {
+            RegisterNetVar(syncVar);
+        }
+    }
+
+    public void OnSettingInstanceDisposed<T>(T configInstance) where T : ISettingBase
+    {
+        if (configInstance is INetworkSyncVar syncVar)
+        {
+            DeregisterNetVar(syncVar);
+        }
+    }
 }

Barotrauma/BarotraumaShared/SharedSource/LuaCs/_Services/_Interfaces/INetworkingService.cs

@@ -33,6 +33,7 @@ public interface IEntityNetworkingService
 {
     Guid GetNetworkIdForInstance(INetworkSyncVar var);
     void RegisterNetVar(INetworkSyncVar netVar);
+    void DeregisterNetVar(INetworkSyncVar netVar);
     void SendNetVar(INetworkSyncVar netVar);
     void SendNetVar(INetworkSyncVar netVar, NetworkConnection connection);
 }