From 2d787de93982939d283887ff4db046d19565e1fd Mon Sep 17 00:00:00 2001
From: CWX <CWXDEV@outlook.com>
Date: Sat, 11 Jun 2022 22:25:07 +0100
Subject: [PATCH] fix for shoreline

---
 .../bepInEx/plugins/CWX-BushWhacker.dll          | Bin 0 -> 6144 bytes
 .../user/mods/CWX-BushWhacker 1.0.1}/LICENSE.txt |   4 ++--
 .../user/mods/CWX-BushWhacker 1.0.1}/package.js  |   0
 .../mods/CWX-BushWhacker 1.0.1}/package.json     |   4 ++--
 .../bepInEx/plugins/CWX-BushWhacker.dll          | Bin 5632 -> 0 bytes
 Live/CWX_BushWhacker/Patch.cs                    |   2 +-
 Live/CWX_BushWhacker/Plugin.cs                   |  11 +++++++----
 7 files changed, 12 insertions(+), 9 deletions(-)
 create mode 100644 Live/CWX_BushWhacker/CWX-BushWhacker 1.0.1/bepInEx/plugins/CWX-BushWhacker.dll
 rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.1.0/user/mods/CWX-BushWhacker 1.1.0 => CWX-BushWhacker 1.0.1/user/mods/CWX-BushWhacker 1.0.1}/LICENSE.txt (92%)
 rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.1.0/user/mods/CWX-BushWhacker 1.1.0 => CWX-BushWhacker 1.0.1/user/mods/CWX-BushWhacker 1.0.1}/package.js (100%)
 rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.1.0/user/mods/CWX-BushWhacker 1.1.0 => CWX-BushWhacker 1.0.1/user/mods/CWX-BushWhacker 1.0.1}/package.json (67%)
 delete mode 100644 Live/CWX_BushWhacker/CWX-BushWhacker 1.1.0/bepInEx/plugins/CWX-BushWhacker.dll

diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.0.1/bepInEx/plugins/CWX-BushWhacker.dll b/Live/CWX_BushWhacker/CWX-BushWhacker 1.0.1/bepInEx/plugins/CWX-BushWhacker.dll
new file mode 100644
index 0000000000000000000000000000000000000000..4ca14c92fca431dbc00f916df2bc0f272d341917
GIT binary patch
literal 6144
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

literal 0
HcmV?d00001

diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.1.0/user/mods/CWX-BushWhacker 1.1.0/LICENSE.txt b/Live/CWX_BushWhacker/CWX-BushWhacker 1.0.1/user/mods/CWX-BushWhacker 1.0.1/LICENSE.txt
similarity index 92%
rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.1.0/user/mods/CWX-BushWhacker 1.1.0/LICENSE.txt
rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.0.1/user/mods/CWX-BushWhacker 1.0.1/LICENSE.txt
index cc68bd7..0e4432a 100644
--- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.1.0/user/mods/CWX-BushWhacker 1.1.0/LICENSE.txt	
+++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.0.1/user/mods/CWX-BushWhacker 1.0.1/LICENSE.txt	
@@ -4,8 +4,8 @@ Copyright (c) [year] [fullname]. All rights reserved.
 
 Developed by: 
               [CWX]
-              [https://github.com/CWXDEV/CWX-DeSharpener]
-			  [https://hub.sp-tarkov.com/files/file/455-cwx-desharpener/]
+              [https://dev.sp-tarkov.com/CWX/CWX-BushWhacker]
+			  [https://hub.sp-tarkov.com/files/file/519-cwx-masterkey/]
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation files
diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.1.0/user/mods/CWX-BushWhacker 1.1.0/package.js b/Live/CWX_BushWhacker/CWX-BushWhacker 1.0.1/user/mods/CWX-BushWhacker 1.0.1/package.js
similarity index 100%
rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.1.0/user/mods/CWX-BushWhacker 1.1.0/package.js
rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.0.1/user/mods/CWX-BushWhacker 1.0.1/package.js
diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.1.0/user/mods/CWX-BushWhacker 1.1.0/package.json b/Live/CWX_BushWhacker/CWX-BushWhacker 1.0.1/user/mods/CWX-BushWhacker 1.0.1/package.json
similarity index 67%
rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.1.0/user/mods/CWX-BushWhacker 1.1.0/package.json
rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.0.1/user/mods/CWX-BushWhacker 1.0.1/package.json
index d1b8313..d31821c 100644
--- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.1.0/user/mods/CWX-BushWhacker 1.1.0/package.json	
+++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.0.1/user/mods/CWX-BushWhacker 1.0.1/package.json	
@@ -1,9 +1,9 @@
 {
     "name": "BUSHWHACKER",
     "author": "CWX",
-    "version": "1.1.0",
+    "version": "1.0.1",
     "license": "NCSA",
     "main": "package.js",
-    "akiVersion": "3.0.0"
+    "akiVersion": "2.3.1"
 }
 
diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.1.0/bepInEx/plugins/CWX-BushWhacker.dll b/Live/CWX_BushWhacker/CWX-BushWhacker 1.1.0/bepInEx/plugins/CWX-BushWhacker.dll
deleted file mode 100644
index 6779567d8dbd8d2c35d69c6b8fafbfb6e153f427..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5632
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

diff --git a/Live/CWX_BushWhacker/Patch.cs b/Live/CWX_BushWhacker/Patch.cs
index d9e2975..ed672e7 100644
--- a/Live/CWX_BushWhacker/Patch.cs
+++ b/Live/CWX_BushWhacker/Patch.cs
@@ -11,10 +11,10 @@ namespace BushWhacker
         {
             return typeof(GameWorld).GetMethod("OnGameStarted", BindingFlags.Public | BindingFlags.Instance);
         }
+
         [PatchPostfix]
         public static void PatchPostFix()
         {
-            Debug.LogError("test patch");
             BushWhacker.DisableBushes();
         }
     }
diff --git a/Live/CWX_BushWhacker/Plugin.cs b/Live/CWX_BushWhacker/Plugin.cs
index 85c6d45..ef08829 100644
--- a/Live/CWX_BushWhacker/Plugin.cs
+++ b/Live/CWX_BushWhacker/Plugin.cs
@@ -17,13 +17,16 @@ namespace BushWhacker
 
         public static void DisableBushes()
         {
-            var gameWorld = Singleton<GameWorld>.Instance;
-            var bushes = GameObject.FindObjectsOfType<ObstacleCollider>().ToList();
+            var bushes = FindObjectsOfType<ObstacleCollider>().ToList();
+            Debug.LogError(bushes.Count);
             foreach (var bushesItem in bushes)
             {
-                if (bushesItem.transform.parent.gameObject.name.Contains("filbert") || bushesItem.transform.parent.gameObject.name.Contains("fibert"))
+                Debug.LogError("1");
+                var filbert = bushesItem?.transform?.parent?.gameObject?.name?.Contains("filbert");
+                var fibert = bushesItem?.transform?.parent?.gameObject?.name?.Contains("fibert");
+                if (filbert == true || fibert == true)
                 {
-                    Object.DestroyImmediate(bushesItem);
+                    DestroyImmediate(bushesItem);
                 }
             }
         }