fix: sdk7 avatar modifier area dynamic excluded ids

unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/AvatarModifierArea/Handler/AvatarModifierAreaComponentHandler.cs

@@ -56,7 +56,9 @@ public void OnComponentModelUpdated(IParcelScene scene, IDCLEntity entity, PBAva
                 excludedIds.Add(modelExcludeId.ToLower());
             }
             internalComponentModel.excludedIds = excludedIds;
-            internalComponentModel.avatarsInArea = new HashSet<GameObject>();
+
+            if (internalComponentModel.avatarsInArea?.Count == 0)
+                internalComponentModel.avatarsInArea = new HashSet<GameObject>();
 
             internalAvatarModifierArea.PutFor(scene, entity, internalComponentModel);
         }

unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/AvatarModifierArea/Tests/AvatarModiferAreaShould.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using DCL.CRDT;
+using DCL.ECS7.InternalComponents;
 using DCL.ECSRuntime;
 using NUnit.Framework;
 using UnityEngine;
@@ -64,6 +65,33 @@ public void CreateInternalComponentCorrectly()
             Assert.IsTrue(internalComponent.Value.model.excludedIds.Contains(excludedId2.ToLower()));
         }
 
+        [Test]
+        public void KeepExistentInternalComponentAvatarsInArea()
+        {
+            var internalComponent = internalComponents.AvatarModifierAreaComponent.GetFor(scene, entity);
+            Assert.IsNull(internalComponent);
+
+            GameObject dummyGO = new GameObject("avatarInArea");
+            internalComponents.AvatarModifierAreaComponent.PutFor(scene, entity, new InternalAvatarModifierArea()
+            {
+                avatarsInArea = new HashSet<GameObject>(){ dummyGO }
+            });
+
+            var model = new PBAvatarModifierArea()
+            {
+                Area =  new Decentraland.Common.Vector3() { X = 4f, Y = 2.5f, Z = 4f },
+                Modifiers = { AvatarModifierType.AmtHideAvatars },
+            };
+            componentHandler.OnComponentModelUpdated(scene, entity, model);
+
+            internalComponent = internalComponents.AvatarModifierAreaComponent.GetFor(scene, entity);
+            Assert.IsNotNull(internalComponent);
+            Assert.AreEqual(1, internalComponent.Value.model.avatarsInArea.Count);
+            Assert.IsTrue(internalComponent.Value.model.avatarsInArea.Contains(dummyGO));
+
+            GameObject.DestroyImmediate(dummyGO);
+        }
+
         [Test]
         [TestCase(AvatarModifierType.AmtHideAvatars)]
         [TestCase(AvatarModifierType.AmtDisablePassports)]

unity-renderer/Assets/DCLPlugins/ECS7/Systems/AvatarModifierAreaSystem/ECSAvatarModifierAreaSystem.cs

@@ -33,8 +33,7 @@ public void Update()
                 var model = componentGroup[i].value.model;
                 Transform entityTransform = scene.entities[entityId].gameObject.transform;
 
-                if (model.excludedIds != null && model.excludedIds.Count > 0)
-                    UpdateExcludedCollidersCollection(model.excludedIds);
+                UpdateExcludedCollidersCollection(model.excludedIds);
 
                 HashSet<GameObject> currentAvatarsInArea = ECSAvatarUtils.DetectAvatars(model.area, entityTransform.position,
                     entityTransform.rotation, excludedColliders);
@@ -91,9 +90,11 @@ private bool AreSetsEqual(HashSet<GameObject> set1, HashSet<GameObject> set2)
 
         private void UpdateExcludedCollidersCollection(HashSet<string> excludedIds)
         {
-            var ownPlayer = dataStore.ownPlayer.Get();
             excludedColliders.Clear();
 
+            if (excludedIds == null || excludedIds.Count == 0) return;
+
+            var ownPlayer = dataStore.ownPlayer.Get();
             foreach (string excludedId in excludedIds)
             {
                 if (dataStore.otherPlayers.TryGetValue(excludedId, out Player player))

unity-renderer/Assets/DCLPlugins/ECS7/Systems/AvatarModifierAreaSystem/Tests/ECSAvatarModifierAreaSystemShould.cs

@@ -80,6 +80,10 @@ public void DetectOnlyAvatarsInArea()
             Assert.AreEqual(2, internalComponentModel.Value.model.avatarsInArea.Count);
             Assert.IsTrue(internalComponentModel.Value.model.avatarsInArea.Contains(fakeAvatar1));
             Assert.IsTrue(internalComponentModel.Value.model.avatarsInArea.Contains(fakeAvatar2));
+
+            GameObject.DestroyImmediate(fakeAvatar1);
+            GameObject.DestroyImmediate(fakeAvatar2);
+            GameObject.DestroyImmediate(fakeAvatar3);
         }
 
         [Test]
@@ -135,6 +139,87 @@ void RemoveModifier(GameObject avatarGO)
             systemUpdate();
             Assert.IsTrue(removeCalled);
             Assert.IsFalse(applyCalled);
+
+            GameObject.DestroyImmediate(fakeAvatar);
+        }
+
+        [Test]
+        public void ReactCorrectlyToExcludedIdsUpdates()
+        {
+            entity.gameObject.transform.position = new Vector3(8, 1, 8);
+            Vector3 entityPosition = entity.gameObject.transform.position;
+            Vector3 area = new Vector3(5f, 5f, 5f);
+
+            var fakeAvatar = CreateFakeAvatar();
+            fakeAvatar.transform.position = new Vector3(100, 100, 100);
+            Physics.SyncTransforms();
+
+            bool applyCalled = false;
+            bool removeCalled = false;
+            void ApplyModifier(GameObject avatarGO)
+            {
+                Assert.AreEqual(fakeAvatar, avatarGO);
+                applyCalled = true;
+            }
+
+            void RemoveModifier(GameObject avatarGO)
+            {
+                Assert.AreEqual(fakeAvatar, avatarGO);
+                removeCalled = true;
+            }
+
+            var model = new InternalAvatarModifierArea()
+            {
+                area = area,
+                OnAvatarEnter = ApplyModifier,
+                OnAvatarExit = RemoveModifier,
+                avatarsInArea = new HashSet<GameObject>(),
+                excludedIds = new HashSet<string>()
+            };
+            internalComponents.AvatarModifierAreaComponent.PutFor(scene, entity, model);
+
+            systemUpdate();
+            Assert.IsFalse(applyCalled);
+            Assert.IsFalse(removeCalled);
+
+            // move avatar inside area
+            fakeAvatar.transform.position = entityPosition + (area * 0.5f);
+            Physics.SyncTransforms();
+
+            systemUpdate();
+            Assert.IsTrue(applyCalled);
+            Assert.IsFalse(removeCalled);
+            applyCalled = false;
+            model = internalComponents.AvatarModifierAreaComponent.GetFor(scene, entity).Value.model;
+            Assert.AreEqual(1, model.avatarsInArea.Count);
+
+            // add current avatar user id to the excluded IDs collection
+            string targetUserId = "0x666";
+            dataStorePlayer.otherPlayers.Add(targetUserId, new Player()
+            {
+                id = targetUserId,
+                collider = fakeAvatar.GetComponentInChildren<BoxCollider>(),
+            });
+            model.excludedIds.Add(targetUserId);
+            internalComponents.AvatarModifierAreaComponent.PutFor(scene, entity, model);
+
+            systemUpdate();
+
+            Assert.IsTrue(removeCalled);
+            Assert.IsFalse(applyCalled);
+            removeCalled = false;
+            model = internalComponents.AvatarModifierAreaComponent.GetFor(scene, entity).Value.model;
+            Assert.AreEqual(0, model.avatarsInArea.Count);
+
+            // remove current avatar user id from the excluded IDs collection
+            model.excludedIds.Clear();
+            internalComponents.AvatarModifierAreaComponent.PutFor(scene, entity, model);
+
+            systemUpdate();
+            Assert.IsTrue(applyCalled);
+            Assert.IsFalse(removeCalled);
+
+            GameObject.DestroyImmediate(fakeAvatar);
         }
 
         private GameObject CreateFakeAvatar()

unity-renderer/Assets/DCLPlugins/ECS7/Tests/ECS7Plugin.Tests.asmdef

@@ -86,7 +86,8 @@
         "GUID:e30cc2f9ee2c45df93dbb8f7f826792f",
         "GUID:091c556278214ab49cfdc87549e3135c",
         "GUID:f334064a9ed3462091d1b06f9e981366",
-        "GUID:59c9e1ae4a4a61c43b19957ad3bfbaf7"
+        "GUID:59c9e1ae4a4a61c43b19957ad3bfbaf7",
+        "GUID:c34e38f41494f834abff029ddf82af43"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],