From 99cb0397977a0830e702746ffa0a3b887f8cdf9e Mon Sep 17 00:00:00 2001
From: Rich Dunne <richdunne@yahoo.com>
Date: Wed, 26 Aug 2020 18:35:45 -0600
Subject: [PATCH] Fixed flares spawning upright

---
 SceneManager/Menus/BarrierMenu.cs | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/SceneManager/Menus/BarrierMenu.cs b/SceneManager/Menus/BarrierMenu.cs
index e528091..7e65fa5 100644
--- a/SceneManager/Menus/BarrierMenu.cs
+++ b/SceneManager/Menus/BarrierMenu.cs
@@ -193,15 +193,20 @@ namespace SceneManager
         private static void SpawnFlare()
         {
             var flare = new Weapon("weapon_flare", shadowBarrier.Position, 1);
-            //flare.SetPositionWithSnap(shadowBarrier.Position);
 
-            // The purpose of this fiber is to allow the flare to spawn and fall to the ground naturally before freezing its position because you can't spawn it on the ground gracefully (it stands upright)
-            //GameFiber.StartNew(delegate
-            //{
-            //    GameFiber.Sleep(1000);
-            //    flare.IsPositionFrozen = true;
-            //    flare.IsCollisionEnabled = false;
-            //});
+            Rage.Native.NativeFunction.Natives.SET_ENTITY_DYNAMIC(flare, true);
+            GameFiber.StartNew(() =>
+            {
+                while (flare && flare.HeightAboveGround > 0.05f)
+                {
+                    GameFiber.Yield();
+                }
+                GameFiber.Sleep(1000);
+                if (flare)
+                {
+                    flare.IsPositionFrozen = true;
+                }
+            });
 
             barriers.Add(flare);
             removeBarrierOptions.Enabled = true;