From 58dd8afa223719e915e214f987029b9060a0cf18 Mon Sep 17 00:00:00 2001
From: Rich Dunne <richdunne@yahoo.com>
Date: Sun, 23 May 2021 08:29:45 -0600
Subject: [PATCH] Fixed remove all barriers sometimes spawning barriers.  Fixed
 replace barriers sometimes duplicating barriers.

---
 SceneManager/Managers/BarrierManager.cs | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/SceneManager/Managers/BarrierManager.cs b/SceneManager/Managers/BarrierManager.cs
index 7b27719..c4c9333 100644
--- a/SceneManager/Managers/BarrierManager.cs
+++ b/SceneManager/Managers/BarrierManager.cs
@@ -215,10 +215,9 @@ namespace SceneManager.Managers
                 case 2:
                     foreach (Barrier barrier in Barriers)
                     {
-                        path = PathManager.Paths.FirstOrDefault(x => x != null && x.Barriers.Contains(barrier));
-                        if (path != null)
+                        if(barrier.Path != null)
                         {
-                            path.Barriers.Remove(barrier);
+                            barrier.Path.Barriers.Remove(barrier);
                         }
 
                         barrier.Delete();
@@ -237,22 +236,19 @@ namespace SceneManager.Managers
 
         internal static void ResetBarriers()
         {
-            GameFiber.StartNew(() =>
-            {
+            //GameFiber.StartNew(() =>
+            //{
                 var currentBarriers = Barriers.Where(b => b.ModelName != "0xa2c44e80").ToList(); // 0xa2c44e80 is the flare weapon hash
                 foreach (Barrier barrier in currentBarriers)
                 {
                     var newBarrier = new Barrier(barrier, barrier.Invincible, barrier.Immobile, barrier.TextureVariation, barrier.LightsEnabled);
                     Barriers.Add(newBarrier);
 
-                    if (barrier.IsValid())
-                    {
-                        barrier.Delete();
-                    }
+                    //barrier.Delete();
                     Barriers.Remove(barrier);
                 }
                 currentBarriers.Clear();
-            }, "Barrier Reset Fiber");
+            //}, "Barrier Reset Fiber");
 
         }