Fix CarStateTransceiver

Author: Corecii

DistanceServer/BasicAutoServer.json

@@ -1,10 +1,11 @@
 {
 	"ServerName": "Test Server",
 	"Port": 45671,
-	"LoadWorkshopLevels": true,
+	"LoadWorkshopLevels": false,
 	"ReportToMasterServer": false,
 	"WelcomeMessage": "Hello, $player",
-	"LevelTimeout": 60.0/*,
+	"LevelTimeout": 60.0,
+	"IdleTimeout": 10.0,
 	"Workshop":[
 		{
 			"Search":"",
@@ -38,5 +39,5 @@
 			"Tags":["Sprint"],
 			"Count":200
 		}
-	]*/
+	]
 }

DistanceServer/DistanceServerBaseExternal/Data/DistanceCar.cs

@@ -203,6 +203,7 @@ public void MakeNetworker()
         }
 
         Rigidbody = networker.GetComponent<Rigidbody>();
+        CarDirectives = CarStateTransceiver.CarLogicBridge.CarDirectives_;
 
         Log.WriteLine("Created DistanceCarNetworker");
 

DistanceServer/DistanceServerBaseExternal/Distance/CarLogicBridge.cs

@@ -7,7 +7,7 @@
 using System.Threading.Tasks;
 
 
-class CarLogicBridge : Distance::CarLogic
+public class CarLogicBridge : Distance::CarLogic
 {
     public CarLogicBridge()
     {

DistanceServer/DistanceServerBaseExternal/Distance/Transceivers/CarStateTransceiver.cs

@@ -11,6 +11,8 @@ public class CarStateTransceiver : NetworkStateTransceiverExternalBase
 {
     Distance::CarStateTransceiver stateTransceiver;
 
+    public CarLogicBridge CarLogicBridge;
+
     public CarStateTransceiver()
     {
         stateTransceiver = new Distance::CarStateTransceiver();
@@ -19,7 +21,8 @@ public CarStateTransceiver()
     public override void Awake()
     {
         // Do CarStateTransceiver Awake
-        PrivateUtilities.setPrivateField(stateTransceiver, "carLogic_", new CarLogicBridge());
+        CarLogicBridge = new CarLogicBridge();
+        PrivateUtilities.setPrivateField(stateTransceiver, "carLogic_", CarLogicBridge);
         PrivateUtilities.setPrivateField(stateTransceiver, "mode_", new GameModeBridge());
         // Do NetworkStateTransceiverGeneric Awake
         PrivateUtilities.setPrivateField(stateTransceiver, "buffer_", new Distance::SortedCircularBuffer<Distance::CarDirectives>(32));
@@ -28,7 +31,22 @@ public override void Awake()
 
     public override void OnSerializeNetworkView(BitStream stream, NetworkMessageInfo info)
     {
-        stateTransceiver.OnSerializeNetworkView(stream, info);
+        if (stream.isReading)
+        {
+            // Bypass SortedCircularBuffer logic. We assume that this is the newest CarDirectives data and update the main CarDirectives.
+            // TODO: use SortedCircularBuffer. Find what index is the newest, streamed in data and call Serialize on it.
+            // (We have to do this because Serialize is not called normally, which means that correct network data never gets turned into a non-zero CarDirectives)
+            var newStream = ((Distance::BitStreamUnity)PrivateUtilities.getPrivateField(typeof(Distance::NetworkStateTransceiver), stateTransceiver, "stream_"));
+            newStream.Encapsulate(stream);
+            double timestamp = double.MinValue;
+            newStream.Serialize(ref timestamp);
+            CarLogicBridge.CarDirectives_.StreamIn(newStream);
+            PrivateUtilities.callPrivateMethod(CarLogicBridge.CarDirectives_, "Serialize", new Distance::BitEncoder(CarLogicBridge.CarDirectives_.Bits_));
+        }
+        else
+        {
+            stateTransceiver.OnSerializeNetworkView(stream, info);
+        }
     }
 
     public override void Start()
@@ -38,7 +56,9 @@ public override void Start()
 
     public override void Update()
     {
-        PrivateUtilities.callPrivateMethod(stateTransceiver, "Update");
+        // For CarStateTransceiver, all this does is copy data from the buffer to the main CarDirectives
+        // Since we are bypassing this at the moment, it would just copy zeros over already non-zero data.
+        //PrivateUtilities.callPrivateMethod(stateTransceiver, "Update");
     }
 
     public override void FixedUpdate() { }

DistanceServer/DistanceServerBaseExternal/DistanceServer.cs

@@ -532,7 +532,7 @@ public bool AttemptToStartLevel()
         {
             foreach (var player in ValidPlayers)
             {
-                if (player.State != DistancePlayer.PlayerState.LoadingGameModeScene)
+                if (player.State == DistancePlayer.PlayerState.LoadingGameModeScene)
                 {
                     player.Stuck = true;
                 }