From 613beff72ed792a9917b76ab389795d7555504ea Mon Sep 17 00:00:00 2001
From: Mitchell McCaffrey <mitchemmc@gmail.com>
Date: Wed, 27 Jan 2021 07:58:35 +1100
Subject: [PATCH] Fix networked state update overriding current changes

---
 src/helpers/useNetworkedState.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/helpers/useNetworkedState.js b/src/helpers/useNetworkedState.js
index ecf17e5..0513c0e 100644
--- a/src/helpers/useNetworkedState.js
+++ b/src/helpers/useNetworkedState.js
@@ -91,7 +91,9 @@ function useNetworkedState(
         if (prevState && prevState[partialUpdatesKey] === update.id) {
           let newState = { ...prevState };
           applyChanges(newState, update.changes);
-          lastSyncedStateRef.current = newState;
+          if (lastSyncedStateRef.current) {
+            applyChanges(lastSyncedStateRef.current, update.changes);
+          }
           return newState;
         } else {
           return prevState;