Merge pull request #7534 from aws-lumberyard-dev/mp_desync_nettime

Fix inadvertent exclusion of NetEntities during filtering and missing netcomponent notification

Gems/Multiplayer/Code/Source/NetworkTime/NetworkTime.cpp

@@ -122,12 +122,8 @@ namespace Multiplayer
                 {
                     AZ::Entity* entity = static_cast<AZ::Entity*>(visEntry->m_userData);
                     NetworkEntityHandle entityHandle(entity, networkEntityTracker);
-                    if (entityHandle.GetNetBindComponent() == nullptr)
+                    if (entityHandle.GetNetBindComponent() != nullptr)
                     {
-                        // Not a net-bound entity, terminate processing of this entity
-                        return;
-                    }
-
                         const AZ::Aabb currentBounds = entityBoundsUnion->GetEntityWorldBoundsUnion(entity->GetId());
                         const AZ::Vector3 currentCenter = currentBounds.GetCenter();
                         NetworkTransformComponent* networkTransform = entity->template FindComponent<NetworkTransformComponent>();
@@ -159,6 +155,8 @@ namespace Multiplayer
                             if (AZ::ShapeIntersection::Overlaps(rewoundAabb, rewindVolume)) // Validate the rewound aabb intersects our rewind volume
                             {
                                 m_rewoundEntities.push_back(entityHandle);
+                                entityHandle.GetNetBindComponent()->NotifySyncRewindState();
+                            }
                         }
                     }
                 }