Merge branch 'main' into mp_session_integ

2021-06-04 13:22:46 -07:00
parent 1d6c69dea2 383fedc973
commit 6ed6f3f808
153 changed files with 3209 additions and 1506 deletions
@@ -263,9 +263,9 @@ namespace Multiplayer
        // Validate that we aren't already planning to remove this entity
        if (safeToExit)
        {
-            for (auto entityId : m_removeList)
+            for (auto remoteEntityId : m_removeList)
            {
-                if (entityId == entityId)
+                if (remoteEntityId == remoteEntityId)
                {
                    safeToExit = false;
                }