(f0d812055) v0.9.9.0

Barotrauma/BarotraumaClient/ClientSource/Items/Components/LightComponent.cs

@@ -3,11 +3,17 @@ using Barotrauma.Lights;
 using Barotrauma.Networking;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
+using System.Collections.Generic;
 
 namespace Barotrauma.Items.Components
 {
     partial class LightComponent : Powered, IServerSerializable, IDrawableComponent
     {
+        private bool? lastReceivedState;
+
+        private CoroutineHandle resetPredictionCoroutine;
+        private float resetPredictionTimer;
+
         public Vector2 DrawSize
         {
             get { return new Vector2(light.Range * 2, light.Range * 2); }
@@ -32,6 +38,12 @@ namespace Barotrauma.Items.Components
             light.Color = LightColor.Multiply(brightness);
         }
 
+        public override void OnItemLoaded()
+        {
+            base.OnItemLoaded();
+            SetLightSourceState(IsActive, lightBrightness);
+        }
+
         public void Draw(SpriteBatch spriteBatch, bool editing = false, float itemDepth = -1)
         {
             if (light.LightSprite != null && (item.body == null || item.body.Enabled) && lightBrightness > 0.0f && IsOn)
@@ -49,9 +61,36 @@ namespace Barotrauma.Items.Components
             }
         }
 
+        partial void OnStateChanged()
+        {
+            if (GameMain.Client == null || !lastReceivedState.HasValue) { return; }
+            //reset to last known server state after the state hasn't changed in 1.0 seconds client-side
+            resetPredictionTimer = 1.0f;
+            if (resetPredictionCoroutine == null || !CoroutineManager.IsCoroutineRunning(resetPredictionCoroutine))
+            {
+                resetPredictionCoroutine = CoroutineManager.StartCoroutine(ResetPredictionAfterDelay());
+            }
+        }
+
+        /// <summary>
+        /// Reset client-side prediction of the light's state to the last known state sent by the server after resetPredictionTimer runs out
+        /// </summary>
+        private IEnumerable<object> ResetPredictionAfterDelay()
+        {
+            while (resetPredictionTimer > 0.0f)
+            {
+                resetPredictionTimer -= CoroutineManager.DeltaTime;
+                yield return CoroutineStatus.Running;
+            }
+            if (lastReceivedState.HasValue) { IsActive = lastReceivedState.Value; }
+            resetPredictionCoroutine = null;
+            yield return CoroutineStatus.Success;
+        }
+
         public void ClientRead(ServerNetObject type, IReadMessage msg, float sendingTime)
         {
-            IsOn = msg.ReadBoolean();
+            IsActive = msg.ReadBoolean();
+            lastReceivedState = IsActive;
         }
 
         protected override void RemoveComponentSpecific()