fix: trigger area was reporting the wrong entity (#7835)

alejandro-jimenez-dcl · web-flow · commit 95f004337727 · 2026-04-02T08:52:20.000+02:00
* fix: release CRDT payloads after trigger area handlings and make the pool local to avoid usage outside of the system

* fix: replace the pool approach for a new struct that is not reused.
diff --git a/Explorer/Assets/DCL/Infrastructure/Global/StaticContainer.cs b/Explorer/Assets/DCL/Infrastructure/Global/StaticContainer.cs
@@ -295,7 +295,16 @@ public UniTask InitializeAsync(StaticSettings settings, CancellationToken ct)
                 new AnimatorPlugin(),
                 new TweenPlugin(),
                 container.MediaContainer.CreatePlugin(exposedGlobalDataContainer.ExposedCameraData),
-                new SDKEntityTriggerAreaPlugin(globalWorld, container.MainPlayerAvatarBaseProxy, exposedGlobalDataContainer.ExposedCameraData.CameraEntityProxy, container.CharacterContainer.CharacterObject, componentsContainer.ComponentPoolsRegistry, container.assetsProvisioner, container.CacheCleaner, exposedGlobalDataContainer.ExposedCameraData, container.SceneRestrictionBusController, web3IdentityProvider, componentsContainer.ComponentPoolsRegistry.AddComponentPool<PBTriggerAreaResult.Types.Trigger>()),
+                new SDKEntityTriggerAreaPlugin(
+                    globalWorld,
+                    container.MainPlayerAvatarBaseProxy,
+                    exposedGlobalDataContainer.ExposedCameraData.CameraEntityProxy,
+                    container.CharacterContainer.CharacterObject,
+                    componentsContainer.ComponentPoolsRegistry,
+                    container.assetsProvisioner,
+                    container.CacheCleaner,
+                    exposedGlobalDataContainer.ExposedCameraData,
+                    container.SceneRestrictionBusController, web3IdentityProvider),
                 new PointerInputAudioPlugin(container.assetsProvisioner),
                 new MapPinPlugin(globalWorld, container.MapPinsEventBus),
                 new MultiplayerPlugin(),
diff --git a/Explorer/Assets/DCL/PluginSystem/World/SDKEntityTriggerAreaPlugin.cs b/Explorer/Assets/DCL/PluginSystem/World/SDKEntityTriggerAreaPlugin.cs
@@ -41,7 +41,6 @@ public class SDKEntityTriggerAreaPlugin : IDCLWorldPlugin<SDKEntityTriggerAreaSe
         private readonly IWeb3IdentityCache web3IdentityCache;
 
         private IComponentPool<SDKEntityTriggerArea.SDKEntityTriggerArea>? sdkEntityTriggerAreaPoolRegistry;
-        private IComponentPool<PBTriggerAreaResult.Types.Trigger> triggerAreaResultTriggerPool;
 
         public SDKEntityTriggerAreaPlugin(
             Arch.Core.World globalWorld,
@@ -53,8 +52,7 @@ public SDKEntityTriggerAreaPlugin(
             CacheCleaner cacheCleaner,
             IExposedCameraData cameraData,
             ISceneRestrictionBusController sceneRestrictionBusController,
-            IWeb3IdentityCache web3IdentityCache,
-            IComponentPool<PBTriggerAreaResult.Types.Trigger> triggerAreaResultTriggerPool)
+            IWeb3IdentityCache web3IdentityCache)
         {
             this.globalWorld = globalWorld;
             this.assetsProvisioner = assetsProvisioner;
@@ -66,7 +64,6 @@ public SDKEntityTriggerAreaPlugin(
             this.cameraData = cameraData;
             this.sceneRestrictionBusController = sceneRestrictionBusController;
             this.web3IdentityCache = web3IdentityCache;
-            this.triggerAreaResultTriggerPool = triggerAreaResultTriggerPool;
         }
 
         public void Dispose()
@@ -91,9 +88,6 @@ public void InjectToWorld(ref ArchSystemsWorldBuilder<Arch.Core.World> builder,
                 ref builder,
                 globalWorld,
                 sharedDependencies.EcsToCRDTWriter,
-                componentPoolsRegistry.GetReferenceTypePool<PBTriggerAreaResult>(),
-                triggerAreaResultTriggerPool,
-                sharedDependencies.SceneStateProvider,
                 sharedDependencies.EntityCollidersSceneCache,
                 sharedDependencies.SceneData));
             finalizeWorldSystems.Add(SDKEntityTriggerAreaCleanupSystem.InjectToWorld(ref builder, sdkEntityTriggerAreaPoolRegistry!));
diff --git a/Explorer/Assets/DCL/SDKComponents/TriggerArea/Systems/TriggerAreaHandlerSystem.cs b/Explorer/Assets/DCL/SDKComponents/TriggerArea/Systems/TriggerAreaHandlerSystem.cs
@@ -10,7 +10,6 @@
 using DCL.Diagnostics;
 using DCL.ECSComponents;
 using DCL.Interaction.Utility;
-using DCL.Optimization.Pools;
 using DCL.SDKComponents.TriggerArea.Components;
 using ECS.Abstract;
 using ECS.Groups;
@@ -29,29 +28,57 @@ namespace DCL.SDKComponents.TriggerArea.Systems
     [LogCategory(ReportCategory.CHARACTER_TRIGGER_AREA)]
     public partial class TriggerAreaHandlerSystem : BaseUnityLoopSystem, IFinalizeWorldSystem
     {
+        /// <summary>
+        ///     Value-type snapshot of all result data passed into the CRDT writer closure,
+        ///     avoiding shared pooled references that could be overwritten before deferred serialization.
+        /// </summary>
+        internal readonly struct ResultData
+        {
+            public readonly TriggerAreaEventType EventType;
+            public readonly uint TriggeredEntity;
+            public readonly uint Timestamp;
+            public readonly Decentraland.Common.Vector3 TriggeredEntityPosition;
+            public readonly Decentraland.Common.Quaternion TriggeredEntityRotation;
+            public readonly uint TriggerEntity;
+            public readonly uint TriggerLayers;
+            public readonly Decentraland.Common.Vector3 TriggerEntityPosition;
+            public readonly Decentraland.Common.Quaternion TriggerEntityRotation;
+            public readonly Decentraland.Common.Vector3 TriggerEntityScale;
+
+            public ResultData(
+                TriggerAreaEventType eventType, uint triggeredEntity, uint timestamp,
+                Decentraland.Common.Vector3 triggeredEntityPosition, Decentraland.Common.Quaternion triggeredEntityRotation,
+                uint triggerEntity, uint triggerLayers,
+                Decentraland.Common.Vector3 triggerEntityPosition, Decentraland.Common.Quaternion triggerEntityRotation,
+                Decentraland.Common.Vector3 triggerEntityScale)
+            {
+                EventType = eventType;
+                TriggeredEntity = triggeredEntity;
+                Timestamp = timestamp;
+                TriggeredEntityPosition = triggeredEntityPosition;
+                TriggeredEntityRotation = triggeredEntityRotation;
+                TriggerEntity = triggerEntity;
+                TriggerLayers = triggerLayers;
+                TriggerEntityPosition = triggerEntityPosition;
+                TriggerEntityRotation = triggerEntityRotation;
+                TriggerEntityScale = triggerEntityScale;
+            }
+        }
+
         private readonly World globalWorld;
         private readonly IECSToCRDTWriter ecsToCRDTWriter;
-        private readonly IComponentPool<PBTriggerAreaResult> triggerAreaResultPool;
-        private readonly IComponentPool<PBTriggerAreaResult.Types.Trigger> triggerAreaResultTriggerPool;
-        private readonly ISceneStateProvider sceneStateProvider;
         private readonly IEntityCollidersSceneCache collidersSceneCache;
         private readonly ISceneData sceneData;
 
         public TriggerAreaHandlerSystem(
             World world,
             World globalWorld,
             IECSToCRDTWriter ecsToCRDTWriter,
-            IComponentPool<PBTriggerAreaResult> triggerAreaResultPool,
-            IComponentPool<PBTriggerAreaResult.Types.Trigger> triggerAreaResultTriggerPool,
-            ISceneStateProvider sceneStateProvider,
             IEntityCollidersSceneCache collidersSceneCache,
             ISceneData sceneData) : base(world)
         {
             this.globalWorld = globalWorld;
             this.ecsToCRDTWriter = ecsToCRDTWriter;
-            this.triggerAreaResultPool = triggerAreaResultPool;
-            this.triggerAreaResultTriggerPool = triggerAreaResultTriggerPool;
-            this.sceneStateProvider = sceneStateProvider;
             this.collidersSceneCache = collidersSceneCache;
             this.sceneData = sceneData;
         }
@@ -155,41 +182,38 @@ private void PropagateResultComponent(in Entity triggerAreaEntity, in CRDTEntity
                 triggerEntityScale = characterTransform.Transform.localScale.ToProtoVector();
             }
 
-            var resultComponent = triggerAreaResultPool.Get();
-            resultComponent.EventType = eventType;
-            resultComponent.TriggeredEntity = (uint)triggerAreaCRDTEntity.Id;
-            resultComponent.Timestamp = incrementalTick;
-            resultComponent.TriggeredEntityPosition = triggerAreaTransform.localPosition.ToProtoVector();
-            resultComponent.TriggeredEntityRotation = triggerAreaTransform.localRotation.ToProtoQuaternion();
-
-            // 'Trigger' Entity (the entity that provokes the trigger event)
-            resultComponent.Trigger = triggerAreaResultTriggerPool.Get();
-            resultComponent.Trigger.Layers = avatarEntity == Entity.Null ? (uint)entityInfo.SDKLayer : (uint)ColliderLayer.ClPlayer;
-            resultComponent.Trigger.Position = triggerEntityPos;
-            resultComponent.Trigger.Rotation = triggerEntityRot;
-            resultComponent.Trigger.Scale = triggerEntityScale;
+            uint triggerLayers = avatarEntity == Entity.Null ? (uint)entityInfo.SDKLayer : (uint)ColliderLayer.ClPlayer;
 
+            uint triggerEntity;
             if (avatarEntity != Entity.Null)
-                resultComponent.Trigger.Entity = globalWorld.TryGet(avatarEntity, out PlayerCRDTEntity playerCrdtEntityComp) ? (uint)playerCrdtEntityComp.CRDTEntity.Id : 999999;
+                triggerEntity = globalWorld.TryGet(avatarEntity, out PlayerCRDTEntity playerCrdtEntityComp) ? (uint)playerCrdtEntityComp.CRDTEntity.Id : 999999;
             else
-                resultComponent.Trigger.Entity = (uint)entityInfo.SDKEntity.Id;
+                triggerEntity = (uint)entityInfo.SDKEntity.Id;
 
-            ecsToCRDTWriter.AppendMessage<PBTriggerAreaResult, (PBTriggerAreaResult result, uint timestamp)>
+            var data = new ResultData(
+                eventType, (uint)triggerAreaCRDTEntity.Id, incrementalTick,
+                triggerAreaTransform.localPosition.ToProtoVector(), triggerAreaTransform.localRotation.ToProtoQuaternion(),
+                triggerEntity, triggerLayers, triggerEntityPos, triggerEntityRot, triggerEntityScale);
+
+            ecsToCRDTWriter.AppendMessage<PBTriggerAreaResult, ResultData>
             (
                 prepareMessage: static (pbTriggerAreaResult, data) =>
                 {
-                    pbTriggerAreaResult.EventType = data.result.EventType;
-                    pbTriggerAreaResult.TriggeredEntity = data.result.TriggeredEntity;
-                    pbTriggerAreaResult.Timestamp = data.timestamp;
-                    pbTriggerAreaResult.TriggeredEntityRotation = data.result.TriggeredEntityRotation;
-                    pbTriggerAreaResult.TriggeredEntityPosition = data.result.TriggeredEntityPosition;
-                    pbTriggerAreaResult.Trigger = data.result.Trigger;
+                    pbTriggerAreaResult.EventType = data.EventType;
+                    pbTriggerAreaResult.TriggeredEntity = data.TriggeredEntity;
+                    pbTriggerAreaResult.Timestamp = data.Timestamp;
+                    pbTriggerAreaResult.TriggeredEntityPosition = data.TriggeredEntityPosition;
+                    pbTriggerAreaResult.TriggeredEntityRotation = data.TriggeredEntityRotation;
+
+                    pbTriggerAreaResult.Trigger ??= new PBTriggerAreaResult.Types.Trigger();
+                    pbTriggerAreaResult.Trigger.Entity = data.TriggerEntity;
+                    pbTriggerAreaResult.Trigger.Layers = data.TriggerLayers;
+                    pbTriggerAreaResult.Trigger.Position = data.TriggerEntityPosition;
+                    pbTriggerAreaResult.Trigger.Rotation = data.TriggerEntityRotation;
+                    pbTriggerAreaResult.Trigger.Scale = data.TriggerEntityScale;
                 },
-                triggerAreaCRDTEntity, (int)incrementalTick, (resultComponent, incrementalTick)
+                triggerAreaCRDTEntity, (int)incrementalTick, data
             );
-
-            triggerAreaResultTriggerPool.Release(resultComponent.Trigger);
-            triggerAreaResultPool.Release(resultComponent);
         }
 
         [Query]
@@ -220,6 +244,8 @@ public void FinalizeComponents(in Query query)
             FinalizeComponentsQuery(World);
         }
 
+        protected override void OnDispose() { }
+
         private bool TryGetAvatarEntity(Transform transform, out Entity entity)
         {
             entity = Entity.Null;
@@ -229,7 +255,4 @@ private bool TryGetAvatarEntity(Transform transform, out Entity entity)
             return true;
         }
     }
-}
-
-
-
+}
diff --git a/Explorer/Assets/DCL/SDKComponents/TriggerArea/Tests/TriggerAreaHandlerSystemShould.cs b/Explorer/Assets/DCL/SDKComponents/TriggerArea/Tests/TriggerAreaHandlerSystemShould.cs
@@ -6,7 +6,6 @@
 using DCL.SDKComponents.TriggerArea.Systems;
 using DCL.SDKEntityTriggerArea.Components;
 using DCL.Interaction.Utility;
-using DCL.Optimization.Pools;
 using DCL.SDKComponents.TriggerArea.Components;
 using ECS.Prioritization.Components;
 using ECS.TestSuite;
@@ -22,9 +21,6 @@ public class TriggerAreaHandlerSystemShould : UnitySystemTestBase<TriggerAreaHan
         private World globalWorld;
         private IECSToCRDTWriter ecsToCRDTWriter;
         private IEntityCollidersSceneCache collidersSceneCache;
-        private ISceneStateProvider sceneStateProvider;
-        private IComponentPool<PBTriggerAreaResult> triggerAreaResultPool;
-        private IComponentPool<PBTriggerAreaResult.Types.Trigger> triggerAreaResultTriggerPool;
         private ISceneData sceneData;
         private PBTriggerAreaResult capturedResult;
         private Entity entity;
@@ -37,14 +33,6 @@ public void Setup()
 
             ecsToCRDTWriter = Substitute.For<IECSToCRDTWriter>();
             collidersSceneCache = Substitute.For<IEntityCollidersSceneCache>();
-            sceneStateProvider = Substitute.For<ISceneStateProvider>();
-            sceneStateProvider.TickNumber.Returns(123u);
-
-            triggerAreaResultPool = Substitute.For<IComponentPool<PBTriggerAreaResult>>();
-            triggerAreaResultPool.Get().Returns(_ => new PBTriggerAreaResult());
-
-            triggerAreaResultTriggerPool = Substitute.For<IComponentPool<PBTriggerAreaResult.Types.Trigger>>();
-            triggerAreaResultTriggerPool.Get().Returns(_ => new PBTriggerAreaResult.Types.Trigger());
 
             sceneData = Substitute.For<ISceneData>();
             sceneData.SceneLoadingConcluded.Returns(true);
@@ -53,9 +41,6 @@ public void Setup()
                 world,
                 globalWorld,
                 ecsToCRDTWriter,
-                triggerAreaResultPool,
-                triggerAreaResultTriggerPool,
-                sceneStateProvider,
                 collidersSceneCache,
                 sceneData);
 
@@ -244,18 +229,22 @@ private SDKEntityTriggerArea.SDKEntityTriggerArea CreateAndAttachAreaMonoBehavio
         }
 
         private void ClearCapturedResult() => capturedResult = null;
+
         private void SetupCRDTWriterCapture(bool firstCallOnly = true)
         {
             ecsToCRDTWriter
-               .AppendMessage<PBTriggerAreaResult, (PBTriggerAreaResult result, uint timestamp)>(Arg.Any<System.Action<PBTriggerAreaResult, (PBTriggerAreaResult result, uint timestamp)>>(), Arg.Any<CRDTEntity>(), Arg.Any<int>(), Arg.Any<(PBTriggerAreaResult, uint)>())
+               .AppendMessage<PBTriggerAreaResult, TriggerAreaHandlerSystem.ResultData>(
+                   Arg.Any<System.Action<PBTriggerAreaResult, TriggerAreaHandlerSystem.ResultData>>(),
+                   Arg.Any<CRDTEntity>(), Arg.Any<int>(),
+                   Arg.Any<TriggerAreaHandlerSystem.ResultData>())
                .Returns(ci =>
                {
-                   var prepare = ci.Arg<System.Action<PBTriggerAreaResult, (PBTriggerAreaResult, uint)>>();
+                   var prepare = ci.Arg<System.Action<PBTriggerAreaResult, TriggerAreaHandlerSystem.ResultData>>();
                    var res = new PBTriggerAreaResult();
 
                    if (firstCallOnly && capturedResult != null) return res;
 
-                   var data = ci.ArgAt<(PBTriggerAreaResult, uint)>(3);
+                   var data = ci.ArgAt<TriggerAreaHandlerSystem.ResultData>(3);
                    prepare(res, data);
                    capturedResult = res;
                    return res;
