diff --git a/Source/Game/Entities/AreaTrigger/AreaTrigger.cs b/Source/Game/Entities/AreaTrigger/AreaTrigger.cs index 2cba99b13..cffd59985 100644 --- a/Source/Game/Entities/AreaTrigger/AreaTrigger.cs +++ b/Source/Game/Entities/AreaTrigger/AreaTrigger.cs @@ -858,6 +858,15 @@ namespace Game.Entities DoActions(unit); _ai.OnUnitEnter(unit); + + // OnUnitEnter script can despawn this areatrigger + if (!IsInWorld) + return; + + // Register areatrigger in Unit after actions/scripts to allow them to determine + // if the unit is in one or more areatriggers with the same id + // without forcing every script to have additional logic excluding this areatrigger + unit.EnterAreaTrigger(this); }